diff --git a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache
index c7413447479a..4fbaf983be8d 100644
--- a/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/jackson_annotations.mustache
@@ -6,15 +6,9 @@
  }}
   @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}})
   @JsonInclude({{#isMap}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMap}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}})
-  {{#withXml}}
-    {{^isContainer}}
-  @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-    {{#xmlName}}
-  // xmlName={{.}}
-    {{/xmlName}}
-  @JacksonXmlProperty({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/xmlName}}")
-  @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}{{#xmlNamespace}}, namespace="{{.}}"{{/xmlNamespace}}{{#isXmlWrapped}}, localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{/isXmlWrapped}})
-    {{/isContainer}}
-  {{/withXml}}
\ No newline at end of file
+{{#withXml}}
+  @JacksonXmlProperty(localName = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#isXmlAttribute}}, isAttribute = true{{/isXmlAttribute}}{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+  {{#isContainer}}
+  @JacksonXmlElementWrapper({{#isXmlWrapped}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}", {{#xmlNamespace}}namespace = "{{.}}", {{/xmlNamespace}}{{/isXmlWrapped}}useWrapping = {{isXmlWrapped}})
+  {{/isContainer}}
+{{/withXml}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache
index f1786f2a495d..fe97e3b1b269 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pojo.mustache
@@ -47,28 +47,15 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
   {{/jackson}}
   {{#withXml}}
-  {{#isXmlAttribute}}
-  @XmlAttribute(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-  {{/isXmlAttribute}}
-  {{^isXmlAttribute}}
-    {{^isContainer}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-  // Is a container wrapped={{isXmlWrapped}}
-      {{#items}}
-  // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}}
-  // items.example={{example}} items.type={{dataType}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/items}}
-      {{#isXmlWrapped}}
-  @XmlElementWrapper({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{#isDateTime}}
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{/isXmlWrapped}}
+    {{^isXmlAttribute}}
+      {{#isDateTime}}
   @XmlJavaTypeAdapter(OffsetDateTimeXmlAdapter.class)
-  {{/isDateTime}}
-  {{/isXmlAttribute}}
+      {{/isDateTime}}
+    {{/isXmlAttribute}}
   {{/withXml}}
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
@@ -181,7 +168,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isMap}}
 
   {{/isReadOnly}}
-   /**
+  /**
   {{#description}}
    * {{.}}
   {{/description}}
@@ -198,7 +185,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    {{#deprecated}}
    * @deprecated
    {{/deprecated}}
-  **/
+   */
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
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 b17b14067d58..06be4ddf265b 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
@@ -52,25 +52,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
   {{/jackson}}
   {{#withXml}}
-  {{#isXmlAttribute}}
-  @XmlAttribute(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-  {{/isXmlAttribute}}
-  {{^isXmlAttribute}}
-    {{^isContainer}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-  // Is a container wrapped={{isXmlWrapped}}
-      {{#items}}
-  // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}}
-  // items.example={{example}} items.type={{dataType}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/items}}
-      {{#isXmlWrapped}}
-  @XmlElementWrapper({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{/isXmlAttribute}}
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{/isXmlWrapped}}
   {{/withXml}}
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
@@ -191,7 +176,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isMap}}
 
   {{/isReadOnly}}
-   /**
+  /**
   {{#description}}
    * {{.}}
   {{/description}}
@@ -208,7 +193,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#deprecated}}
    * @deprecated
   {{/deprecated}}
-  **/
+   */
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
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 b17b14067d58..06be4ddf265b 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
@@ -52,25 +52,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
   {{/jackson}}
   {{#withXml}}
-  {{#isXmlAttribute}}
-  @XmlAttribute(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-  {{/isXmlAttribute}}
-  {{^isXmlAttribute}}
-    {{^isContainer}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-  // Is a container wrapped={{isXmlWrapped}}
-      {{#items}}
-  // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}}
-  // items.example={{example}} items.type={{dataType}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/items}}
-      {{#isXmlWrapped}}
-  @XmlElementWrapper({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{/isXmlAttribute}}
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{/isXmlWrapped}}
   {{/withXml}}
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
@@ -191,7 +176,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isMap}}
 
   {{/isReadOnly}}
-   /**
+  /**
   {{#description}}
    * {{.}}
   {{/description}}
@@ -208,7 +193,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#deprecated}}
    * @deprecated
   {{/deprecated}}
-  **/
+   */
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
index 870bf32c1ca0..afad09aa3cd8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/microprofile/pojo.mustache
@@ -1,10 +1,9 @@
 {{#withXml}}
-@XmlAccessorType(XmlAccessType.FIELD)
-{{#hasVars}} @XmlType(name = "{{classname}}", propOrder =
-    { {{#vars}}"{{name}}"{{^-last}}, {{/-last}}{{/vars}}
-}){{/hasVars}}
+{{#hasVars}}@XmlType(name = "{{classname}}", propOrder =
+    { {{#vars}}"{{name}}"{{^-last}}, {{/-last}}{{/vars}} }
+){{/hasVars}}
 {{^hasVars}}@XmlType(name = "{{classname}}"){{/hasVars}}
-{{^parent}}@XmlRootElement(name="{{classname}}"){{/parent}}
+{{> xmlAnnotation }}
 {{/withXml}}
 {{#jackson}}
 @JsonPropertyOrder({
@@ -21,7 +20,7 @@
 {{#description}}
 /**
   * {{{.}}}
- **/
+  */
 {{/description}}
 {{>additionalModelTypeAnnotations}}
 {{#vendorExtensions.x-class-extra-annotation}}
@@ -35,12 +34,15 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
   public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
 {{/jackson}}
 {{#withXml}}
-  @XmlElement(name="{{baseName}}"{{#required}}, required = {{required}}{{/required}})
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+  {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+  {{/isXmlWrapped}}
 {{/withXml}}
 {{#description}}
  /**
-   * {{{.}}}
-  **/
+  * {{{.}}}
+  */
 {{/description}}
   {{^withXml}}
   {{#jsonb}}@JsonbProperty("{{baseName}}"){{/jsonb}}
@@ -71,7 +73,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
   }
   {{/withXml}}{{/vendorExtensions.x-has-readonly-properties}}
   {{#vars}}
- /**
+  /**
   {{#description}}
    * {{.}}
   {{/description}}
@@ -88,7 +90,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
   {{#deprecated}}
    * @deprecated
   {{/deprecated}}
-  **/
+   **/
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
@@ -112,8 +114,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
 
   {{^isReadOnly}}
   /**
-    * Set {{name}}
-  **/
+   * Set {{name}}
+   */
 {{#vendorExtensions.x-setter-extra-annotation}}  {{{vendorExtensions.x-setter-extra-annotation}}}
 {{/vendorExtensions.x-setter-extra-annotation}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}  public void {{setter}}({{{datatypeWithEnum}}} {{name}}) {
     this.{{name}} = {{name}};
@@ -148,8 +150,8 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}}{{#vendorExtensi
   {{/vars}}
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
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 f5b7d071a2d0..1250a71eca36 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
@@ -55,25 +55,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
   {{/jackson}}
   {{#withXml}}
-  {{#isXmlAttribute}}
-  @XmlAttribute(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-  {{/isXmlAttribute}}
-  {{^isXmlAttribute}}
-    {{^isContainer}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-  // Is a container wrapped={{isXmlWrapped}}
-      {{#items}}
-  // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}}
-  // items.example={{example}} items.type={{dataType}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/items}}
-      {{#isXmlWrapped}}
-  @XmlElementWrapper({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{/isXmlAttribute}}
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{/isXmlWrapped}}
   {{/withXml}}
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
@@ -182,7 +167,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isMap}}
 
   {{/isReadOnly}}
-   /**
+  /**
   {{#description}}
    * {{.}}
   {{/description}}
@@ -199,7 +184,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    {{#deprecated}}
    * @deprecated
    {{/deprecated}}
-  **/
+   */
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
@@ -230,8 +215,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{!unannotated, Jackson would pick this up automatically and add it *in addition* to the _JsonNullable getter field}}
   @JsonIgnore
 {{/vendorExtensions.x-is-jackson-optional-nullable}}
-{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}
-  public {{{datatypeWithEnum}}} {{getter}}() {
+{{^vendorExtensions.x-is-jackson-optional-nullable}}{{#jackson}}{{> jackson_annotations}}{{/jackson}}{{/vendorExtensions.x-is-jackson-optional-nullable}}  public {{{datatypeWithEnum}}} {{getter}}() {
     {{#vendorExtensions.x-is-jackson-optional-nullable}}
     {{#isReadOnly}}{{! A readonly attribute doesn't have setter => jackson will set null directly if explicitly returned by API, so make sure we have an empty JsonNullable}}
     if ({{name}} == null) {
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 067ceade0d6e..30f4c0135a97 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
@@ -59,25 +59,10 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{/isEnum}}
   public static final String SERIALIZED_NAME_{{nameInSnakeCase}} = "{{baseName}}";
   {{#withXml}}
-  {{#isXmlAttribute}}
-  @XmlAttribute(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-  {{/isXmlAttribute}}
-  {{^isXmlAttribute}}
-    {{^isContainer}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-  // Is a container wrapped={{isXmlWrapped}}
-      {{#items}}
-  // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}}
-  // items.example={{example}} items.type={{dataType}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/items}}
-      {{#isXmlWrapped}}
-  @XmlElementWrapper({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{/isXmlAttribute}}
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{/isXmlWrapped}}
   {{/withXml}}
   {{#deprecated}}
   @Deprecated
@@ -148,7 +133,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isMap}}
 
   {{/isReadOnly}}
-   /**
+  /**
   {{#description}}
    * {{.}}
   {{/description}}
@@ -165,7 +150,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    {{#deprecated}}
    * @deprecated
    {{/deprecated}}
-  **/
+   */
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
@@ -354,12 +339,12 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
     {{/requiredVars}}
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to {{classname}}
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to {{classname}}
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!{{classname}}.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -585,22 +570,22 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   }
 {{/hasChildren}}
 
- /**
-  * Create an instance of {{classname}} given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of {{classname}}
-  * @throws IOException if the JSON string is invalid with respect to {{classname}}
-  */
+  /**
+   * Create an instance of {{classname}} given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of {{classname}}
+   * @throws IOException if the JSON string is invalid with respect to {{classname}}
+   */
   public static {{{classname}}} fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, {{{classname}}}.class);
   }
 
- /**
-  * Convert an instance of {{classname}} to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of {{classname}} to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index d4c6ec8d1540..05be7e5c538c 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -52,28 +52,15 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
   {{/jackson}}
   {{#withXml}}
-  {{#isXmlAttribute}}
-  @XmlAttribute(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-  {{/isXmlAttribute}}
-  {{^isXmlAttribute}}
-    {{^isContainer}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-  // Is a container wrapped={{isXmlWrapped}}
-      {{#items}}
-  // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}}
-  // items.example={{example}} items.type={{dataType}}
-  @XmlElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/items}}
-      {{#isXmlWrapped}}
-  @XmlElementWrapper({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{#isDateTime}}
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{/isXmlWrapped}}
+    {{^isXmlAttribute}}
+      {{#isDateTime}}
   @XmlJavaTypeAdapter(OffsetDateTimeXmlAdapter.class)
-  {{/isDateTime}}
-  {{/isXmlAttribute}}
+      {{/isDateTime}}
+    {{/isXmlAttribute}}
   {{/withXml}}
   {{#gson}}
   @SerializedName(SERIALIZED_NAME_{{nameInSnakeCase}})
@@ -115,8 +102,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{#vendorExtensions.x-has-readonly-properties}}
   {{^withXml}}
   /**
-  * Constructor with only readonly parameters{{#generateConstructorWithAllArgs}}{{^vendorExtensions.x-java-all-args-constructor}} and all parameters{{/vendorExtensions.x-java-all-args-constructor}}{{/generateConstructorWithAllArgs}}
-  */
+   * Constructor with only readonly parameters{{#generateConstructorWithAllArgs}}{{^vendorExtensions.x-java-all-args-constructor}} and all parameters{{/vendorExtensions.x-java-all-args-constructor}}{{/generateConstructorWithAllArgs}}
+   */
   {{#jsonb}}@JsonbCreator{{/jsonb}}{{#jackson}}@JsonCreator{{/jackson}}
   public {{classname}}(
   {{#readOnlyVars}}
@@ -133,8 +120,8 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
 {{#vendorExtensions.x-java-all-args-constructor}}
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public {{classname}}({{#vendorExtensions.x-java-all-args-constructor-vars}}{{#jsonb}}@JsonbProperty(value = "{{baseName}}"{{^required}}, nullable = true{{/required}}){{/jsonb}}{{#jackson}}@JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}}){{/jackson}} {{{datatypeWithEnum}}} {{name}}{{^-last}}, {{/-last}}{{/vendorExtensions.x-java-all-args-constructor-vars}}) {
 {{#parent}}
     super({{#parentVars}}{{name}}{{^-last}}, {{/-last}}{{/parentVars}});
@@ -202,7 +189,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
   {{/isMap}}
 
   {{/isReadOnly}}
-   /**
+  /**
   {{#description}}
    * {{.}}
   {{/description}}
@@ -219,7 +206,7 @@ public class {{classname}} {{#parent}}extends {{{.}}} {{/parent}}{{#vendorExtens
    {{#deprecated}}
    * @deprecated
    {{/deprecated}}
-  **/
+   */
 {{#deprecated}}
   @Deprecated
 {{/deprecated}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
index c343e07fefc0..23cf601c88ef 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/model.mustache
@@ -25,6 +25,7 @@ import org.hibernate.validator.constraints.*;
 {{#withXml}}
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 {{/withXml}}
 {{/jackson}}
 {{#swagger2AnnotationLibrary}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index 44be9a408981..e94b47c326fe 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -128,8 +128,8 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#vendorExtensions.x-java-all-args-constructor}}
 
   /**
-  * Constructor with all args parameters
-  */
+   * 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}});
@@ -215,7 +215,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#deprecated}}
    * @deprecated
   {{/deprecated}}
-  */
+   */
   {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
   {{/vendorExtensions.x-extra-annotation}}
@@ -234,9 +234,18 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#jackson}}
   @JsonProperty("{{baseName}}")
   {{#withXml}}
-  @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
+  @JacksonXmlProperty(localName = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#isXmlAttribute}}, isAttribute = true{{/isXmlAttribute}}{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isContainer}}
+  @JacksonXmlElementWrapper({{#isXmlWrapped}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}", {{#xmlNamespace}}namespace = "{{.}}", {{/xmlNamespace}}{{/isXmlWrapped}}useWrapping = {{isXmlWrapped}})
+    {{/isContainer}}
   {{/withXml}}
   {{/jackson}}
+  {{#withXml}}
+  @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{#isXmlWrapped}}
+  @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+    {{/isXmlWrapped}}
+  {{/withXml}}
   {{#deprecated}}
   @Deprecated
   {{/deprecated}}
@@ -249,7 +258,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#deprecated}}
   /**
    * @deprecated
-  */
+   */
   {{/deprecated}}
   {{#vendorExtensions.x-setter-extra-annotation}}
   {{{vendorExtensions.x-setter-extra-annotation}}}
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/xmlAnnotation.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/xmlAnnotation.mustache
index a9e6fb0fa0bd..b3a89fa362fd 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/xmlAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/xmlAnnotation.mustache
@@ -1,7 +1,6 @@
 {{#withXml}}
 {{#jackson}}
-@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@JacksonXmlRootElement({{#xmlNamespace}}namespace = "{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
 {{/jackson}}
-@XmlRootElement({{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
-@XmlAccessorType(XmlAccessType.FIELD)
-{{/withXml}}
\ No newline at end of file
+@XmlRootElement({{#xmlNamespace}}namespace = "{{.}}", {{/xmlNamespace}}name = "{{xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlAccessorType(XmlAccessType.FIELD){{/withXml}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/jackson_annotations.mustache
deleted file mode 100644
index ccde126f54eb..000000000000
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/mp/jackson_annotations.mustache
+++ /dev/null
@@ -1,19 +0,0 @@
-{{!
- If this is map and items are nullable, make sure that nulls are included.
- To determine what JsonInclude.Include method to use, consider the following:
- * If the field is required, always include it, even if it is null.
- * Else use custom behaviour, IOW use whatever is defined on the object mapper
- }}
-  @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}})
-  @JsonInclude({{#isMap}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMap}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}})
-  {{#withXml}}
-    {{^isContainer}}
-  @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-      {{#isXmlWrapped}}
-  // items.xmlName={{items.xmlName}}
-  @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}, {{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{#items.xmlName}}{{items.xmlName}}{{/items.xmlName}}{{^items.xmlName}}{{items.baseName}}{{/items.xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{/withXml}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/jackson_annotations.mustache
deleted file mode 100644
index ccde126f54eb..000000000000
--- a/modules/openapi-generator/src/main/resources/java-helidon/client/libraries/se/jackson_annotations.mustache
+++ /dev/null
@@ -1,19 +0,0 @@
-{{!
- If this is map and items are nullable, make sure that nulls are included.
- To determine what JsonInclude.Include method to use, consider the following:
- * If the field is required, always include it, even if it is null.
- * Else use custom behaviour, IOW use whatever is defined on the object mapper
- }}
-  @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}})
-  @JsonInclude({{#isMap}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMap}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}})
-  {{#withXml}}
-    {{^isContainer}}
-  @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    {{/isContainer}}
-    {{#isContainer}}
-      {{#isXmlWrapped}}
-  // items.xmlName={{items.xmlName}}
-  @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}, {{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{#items.xmlName}}{{items.xmlName}}{{/items.xmlName}}{{^items.xmlName}}{{items.baseName}}{{/items.xmlName}}")
-      {{/isXmlWrapped}}
-    {{/isContainer}}
-  {{/withXml}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/jackson_annotations.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/jackson_annotations.mustache
index 41afad002891..571375ebe94d 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/jackson_annotations.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/jackson_annotations.mustache
@@ -7,15 +7,9 @@
     @JsonProperty(JSON_PROPERTY_{{nameInSnakeCase}})
     @JsonInclude({{#isMap}}{{#items.isNullable}}content = JsonInclude.Include.ALWAYS, {{/items.isNullable}}{{/isMap}}value = JsonInclude.Include.{{#required}}ALWAYS{{/required}}{{^required}}USE_DEFAULTS{{/required}})
     {{#withXml}}
-        {{^isContainer}}
-    @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-    @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-        {{/isContainer}}
+    @JacksonXmlProperty(localName = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#isXmlAttribute}}, isAttribute = true{{/isXmlAttribute}}{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
         {{#isContainer}}
-            {{#isXmlWrapped}}
-    // items.xmlName={{items.xmlName}}
-    @JacksonXmlElementWrapper(useWrapping = {{isXmlWrapped}}, {{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#items.xmlName}}{{items.xmlName}}{{/items.xmlName}}{{^items.xmlName}}{{items.baseName}}{{/items.xmlName}}")
-            {{/isXmlWrapped}}
+    @JacksonXmlElementWrapper({{#isXmlWrapped}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}", {{#xmlNamespace}}namespace = "{{.}}", {{/xmlNamespace}}{{/isXmlWrapped}}useWrapping = {{isXmlWrapped}})
         {{/isContainer}}
     {{/withXml}}
     {{#jackson}}
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache
index f100a893156b..2d05a31d1597 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/pojo.mustache
@@ -48,25 +48,10 @@ Declare the class with extends and implements
         {{/isEnum}}
     public static final String JSON_PROPERTY_{{nameInSnakeCase}} = "{{baseName}}";
         {{#withXml}}
-            {{#isXmlAttribute}}
-    @XmlAttribute(name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"
-            {{/isXmlAttribute}}
-            {{^isXmlAttribute}}
-                {{^isContainer}}
-    @XmlElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-                {{/isContainer}}
-                {{#isContainer}}
-    // Is a container wrapped={{isXmlWrapped}}
-                    {{#items}}
-    // items.name={{name}} items.baseName={{baseName}} items.xmlName={{xmlName}} items.xmlNamespace={{xmlNamespace}}
-    // items.example={{example}} items.type={{dataType}}
-    @XmlElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-                    {{/items}}
-                    {{#isXmlWrapped}}
-    @XmlElementWrapper({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
-                    {{/isXmlWrapped}}
-                {{/isContainer}}
-            {{/isXmlAttribute}}
+    @Xml{{#isXmlAttribute}}Attribute{{/isXmlAttribute}}{{^isXmlAttribute}}Element{{/isXmlAttribute}}(name = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+          {{#isXmlWrapped}}
+    @XmlElementWrapper(name = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+          {{/isXmlWrapped}}
         {{/withXml}}
         {{#vendorExtensions.x-field-extra-annotation}}
         {{{vendorExtensions.x-field-extra-annotation}}}
@@ -184,7 +169,7 @@ Declare the class with extends and implements
      * maximum: {{maximum}}
         {{/maximum}}
      * @return {{name}}
-     **/
+     */
 {{>common/model/beanValidation}}{{!
         }}{{#generateSwagger1Annotations}}
     @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
diff --git a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/xmlAnnotation.mustache b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/xmlAnnotation.mustache
index 04566fa1167c..7f2067308e27 100644
--- a/modules/openapi-generator/src/main/resources/java-micronaut/common/model/xmlAnnotation.mustache
+++ b/modules/openapi-generator/src/main/resources/java-micronaut/common/model/xmlAnnotation.mustache
@@ -1,6 +1,6 @@
 {{#withXml}}
 
-@XmlRootElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
+@XmlRootElement({{#xmlNamespace}}namespace = "{{xmlNamespace}}", {{/xmlNamespace}}name = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}")
 @XmlAccessorType(XmlAccessType.FIELD)
 {{#jackson}}
-@JacksonXmlRootElement({{#xmlNamespace}}namespace="{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}
\ No newline at end of file
+@JacksonXmlRootElement({{#xmlNamespace}}namespace = "{{xmlNamespace}}", {{/xmlNamespace}}localName = "{{#xmlName}}{{xmlName}}{{/xmlName}}{{^xmlName}}{{classname}}{{/xmlName}}"){{/jackson}}{{/withXml}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache
index 7a71d8c0720a..2d287ef5e7cb 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/model.mustache
@@ -15,6 +15,7 @@ import {{javaxPackage}}.validation.constraints.*;
 {{#withXml}}
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 {{/withXml}}
 {{/jackson}}
 {{#withXml}}
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
index f9161d58c588..39ba1ad15c61 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/pojo.mustache
@@ -21,8 +21,13 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
     {{/isContainer}}
     {{/isEnum}}
   {{#jackson}}
-  @JsonProperty("{{baseName}}"){{#withXml}}
-  @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}"){{/withXml}}
+  @JsonProperty("{{baseName}}")
+  {{#withXml}}
+  @JacksonXmlProperty(localName = "{{items.xmlName}}{{^items.xmlName}}{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}{{/items.xmlName}}"{{#isXmlAttribute}}, isAttribute = true{{/isXmlAttribute}}{{#xmlNamespace}}, namespace = "{{.}}"{{/xmlNamespace}})
+  {{#isContainer}}
+  @JacksonXmlElementWrapper({{#isXmlWrapped}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}", {{#xmlNamespace}}namespace = "{{.}}", {{/xmlNamespace}}{{/isXmlWrapped}}useWrapping = {{isXmlWrapped}})
+  {{/isContainer}}
+  {{/withXml}}
   {{/jackson}}
   {{#gson}}
   @SerializedName("{{baseName}}")
@@ -62,7 +67,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
   }
   {{/isMap}}
 
-   /**
+  /**
   {{#description}}
    * {{{.}}}
   {{/description}}
@@ -76,7 +81,7 @@ public class {{classname}} {{#parent}}extends {{{.}}}{{/parent}} {{#vendorExtens
    * maximum: {{.}}
   {{/maximum}}
    * @return {{name}}
-  **/
+   */
  {{#vendorExtensions.x-extra-annotation}}
   {{{vendorExtensions.x-extra-annotation}}}
   {{/vendorExtensions.x-extra-annotation}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
index 49410305d19a..942315f15344 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java
@@ -118,6 +118,19 @@ public String toString() {
             .iterator();
     }
 
+    @DataProvider Iterator<Library> librariesSupportingJackson() {
+        return Arrays.stream(Library.values())
+            .filter(library -> library.getSupportedSerializers().contains(Serializer.JACKSON))
+            .iterator();
+    }
+
+    @DataProvider Iterator<Library> librariesNotSupportingJackson() {
+        return Arrays.stream(Library.values())
+            .filter(library -> !library.getSupportedSerializers().contains(Serializer.JACKSON))
+            .iterator();
+    }
+    
+
     @Test public void arraysInRequestBody() {
         OpenAPI openAPI = TestUtils.createOpenAPI();
         final JavaClientCodegen codegen = new JavaClientCodegen();
@@ -2676,4 +2689,256 @@ static private Path newTempFolder() {
             throw new RuntimeException(e);
         }
     }
+        
+    /**
+     * General XML annotations test (both JAXB and Jackson)
+     * <br>
+     * Includes regression tests for:
+     * - <a href="https://github.com/OpenAPITools/openapi-generator/issues/2417">Correct Jackson annotation when `wrapped: false`</a>
+     * - <a href="https://github.com/OpenAPITools/openapi-generator/issues/18869">Microprofile generator missing Jackson annotations and namespaces</a>
+     */
+    @Test(dataProvider = "librariesSupportingJackson") 
+    void shouldGenerateCorrectXmlAnnotations(Library library) throws IOException {
+        // Arrange
+        final String TEST_SPEC = "src/test/resources/3_0/java/xml-annotations-test.yaml";
+        final Path output = newTempFolder();
+
+        JavaClientCodegen codegen = new JavaClientCodegen();
+        codegen.setLibrary(library.getValue());
+        codegen.setSerializationLibrary("jackson");
+        codegen.setWithXml(true);
+        codegen.setOutputDir(output.toString());
+
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false");
+        generator.setGenerateMetadata(false);
+
+        // Act
+        generator.opts(new ClientOptInput().config(codegen).openAPI(TestUtils.parseSpec(TEST_SPEC))).generate();
+
+        // Assert
+        JavaFileAssert.assertThat(output.resolve("src/main/java/org/openapitools/client/model/Pet.java").toFile())
+            .assertTypeAnnotations()
+            .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD"))
+            .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .toType()
+
+            // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            .hasProperty("tags").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Tag\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"TagList\""))
+            .toProperty().toType()
+            .assertMethod("getTags").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Tag\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("friends").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"friend-pet\""))
+            .toProperty().toType()
+            .assertMethod("getFriends").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"friend-pet\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names)    
+            .hasProperty("status").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"PetStatus\""))
+            .toProperty().toType()
+            .assertMethod("getStatus").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"PetStatus\""))
+            .toMethod().toFileAssert()
+
+            // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays)
+            //   maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("photoUrls").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"photoUrls\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"photoUrls\""))
+            .toProperty().toType()
+            .assertMethod("getPhotoUrls").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"photoUrls\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute)
+            .hasProperty("name").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlElement")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlAttribute", Map.of("name", "\"name\""))
+            .toProperty().toType()
+            .assertMethod("getName").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\""))
+            .toMethod().toFileAssert()
+
+            // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces)
+            .hasProperty("id").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toProperty().toType()
+            .assertMethod("getId").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toMethod().toFileAssert()
+
+            // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("foods").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"yummy-yummy\""))
+            .toProperty().toType()
+            .assertMethod("getFoods").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\""))
+            .toMethod().toFileAssert()
+
+            // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("colors").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"color\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"colors\""))
+            .toProperty().toType()
+            .assertMethod("getColors").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"color\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"colors\""))
+            .toMethod().toFileAssert()
+
+            // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("categories").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Category\""))
+            .toProperty().toType()
+            .assertMethod("getCategories").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Category\""))
+            // ↓ specific regression test for #2417: (useWrapping=false) needs to be present
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            //   maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("activities").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"item\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"activities-array\""))
+            .toProperty().toType()
+            .assertMethod("getActivities").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"item\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\""));
+    }
+
+    /**
+     * General XML annotations test (only JAXB)
+     */
+    @Test(dataProvider = "librariesNotSupportingJackson") 
+    void shouldGenerateCorrectJaxbAnnotations(Library library) {
+        // Arrange
+        final String TEST_SPEC = "src/test/resources/3_0/java/xml-annotations-test.yaml";
+        final Path output = newTempFolder();
+
+        JavaClientCodegen codegen = new JavaClientCodegen();
+        codegen.setLibrary(library.getValue());
+        codegen.setSerializationLibrary("jackson");
+        codegen.setWithXml(true);
+        codegen.setOutputDir(output.toString());
+
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false");
+        generator.setGenerateMetadata(false);
+
+        // Act
+        generator.opts(new ClientOptInput().config(codegen).openAPI(TestUtils.parseSpec(TEST_SPEC))).generate();
+
+        // Assert
+        JavaFileAssert.assertThat(output.resolve("src/main/java/org/openapitools/client/model/Pet.java").toFile())
+            .assertTypeAnnotations()
+            .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD"))
+            .toType()
+
+            // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            .hasProperty("tags").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Tag\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"TagList\""))
+            .toProperty().toType()
+
+            // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("friends").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"friend-pet\""))
+            .toProperty().toType()
+
+            // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names)    
+            .hasProperty("status").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"PetStatus\""))
+            .toProperty().toType()
+
+            // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays)
+            //   maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("photoUrls").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"photoUrls\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"photoUrls\""))
+            .toProperty().toType()
+
+            // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute)
+            .hasProperty("name").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlElement")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlAttribute", Map.of("name", "\"name\""))
+            .toProperty().toType()
+
+            // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces)
+            .hasProperty("id").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toProperty().toType()
+
+            // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("foods").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"yummy-yummy\""))
+            .toProperty().toType()
+
+            // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("colors").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"color\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"colors\""))
+            .toProperty().toType()
+
+            // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("categories").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Category\""))
+            .toProperty().toType()
+
+            // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            //   maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("activities").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"item\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"activities-array\""));
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/JavaMicronautClientCodegenTest.java
similarity index 62%
rename from modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java
rename to modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/JavaMicronautClientCodegenTest.java
index 2c449e9bfee9..d3e50f797001 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautClientCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/JavaMicronautClientCodegenTest.java
@@ -3,16 +3,22 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.servers.Server;
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.*;
+import org.openapitools.codegen.java.assertions.JavaFileAssert;
 import org.openapitools.codegen.languages.JavaMicronautClientCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
 import static java.util.stream.Collectors.groupingBy;
-import static org.testng.Assert.*;
+import static org.testng.Assert.assertEquals;
 
 
-public class MicronautClientCodegenTest extends AbstractMicronautCodegenTest {
+public class JavaMicronautClientCodegenTest extends AbstractMicronautCodegenTest {
     @Test
     public void clientOptsUnicity() {
         JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen();
@@ -310,4 +316,150 @@ public void testConfigurePathSeparator() {
         // Micronaut declarative http client should use the provided path separator
         assertFileContains(outputPath + "/src/main/java/org/openapitools/api/PetApi.java", "@Client(\"${openapi-micronaut-client.base-path}\")");
     }
+
+    /**
+     * General XML annotations test (both JAXB and Jackson)
+     * <br>
+     * Includes regression tests for:
+     * - <a href="https://github.com/OpenAPITools/openapi-generator/issues/2417">Correct Jackson annotation when `wrapped: false`</a>
+     */
+    @Test public void shouldGenerateCorrectXmlAnnotations() throws IOException {
+        // Arrange
+        final String TEST_SPEC = "src/test/resources/3_0/java/xml-annotations-test.yaml";
+        final Path output = Files.createTempDirectory("test-xml-annotations_");
+        output.toFile().deleteOnExit();
+
+        JavaMicronautClientCodegen codegen = new JavaMicronautClientCodegen();
+        codegen.setWithXml(true);
+        codegen.setOutputDir(output.toString());
+
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false");
+        generator.setGenerateMetadata(false);
+
+        // Act
+        generator.opts(new ClientOptInput().config(codegen).openAPI(TestUtils.parseSpec(TEST_SPEC))).generate();
+
+        // Assert
+        JavaFileAssert.assertThat(output.resolve("src/main/java/org/openapitools/model/Pet.java").toFile())
+            .assertTypeAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD"))
+            .toType()
+
+            // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            .hasProperty("tags").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Tag\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"TagList\""))
+            .toProperty().toType()
+            .assertMethod("getTags").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Tag\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("friends").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"friend-pet\""))
+            .toProperty().toType()
+            .assertMethod("getFriends").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"friend-pet\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names)    
+            .hasProperty("status").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"PetStatus\""))
+            .toProperty().toType()
+            .assertMethod("getStatus").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"PetStatus\""))
+            .toMethod().toFileAssert()
+
+            // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays)
+            //   maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("photoUrls").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"photoUrls\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"photoUrls\""))
+            .toProperty().toType()
+            .assertMethod("getPhotoUrls").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"photoUrls\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute)
+            .hasProperty("name").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlElement")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlAttribute", Map.of("name", "\"name\""))
+            .toProperty().toType()
+            .assertMethod("getName").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\""))
+            .toMethod().toFileAssert()
+
+            // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces)
+            .hasProperty("id").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toProperty().toType()
+            .assertMethod("getId").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toMethod().toFileAssert()
+
+            // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("foods").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"yummy-yummy\""))
+            .toProperty().toType()
+            .assertMethod("getFoods").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\""))
+            .toMethod().toFileAssert()
+
+            // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("colors").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"color\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"colors\""))
+            .toProperty().toType()
+            .assertMethod("getColors").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"color\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"colors\""))
+            .toMethod().toFileAssert()
+
+            // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("categories").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Category\""))
+            .toProperty().toType()
+            .assertMethod("getCategories").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Category\""))
+            // ↓ specific regression test for #2417: (useWrapping=false) needs to be present
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            //   maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("activities").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"item\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"activities-array\""))
+            .toProperty().toType()
+            .assertMethod("getActivities").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"item\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\""));
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/JavaMicronautServerCodegenTest.java
similarity index 65%
rename from modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautServerCodegenTest.java
rename to modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/JavaMicronautServerCodegenTest.java
index 4b1ad1db749c..e2b79e245d0f 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/MicronautServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/micronaut/JavaMicronautServerCodegenTest.java
@@ -3,17 +3,21 @@
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.info.Info;
 import io.swagger.v3.oas.models.servers.Server;
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.TestUtils;
+import org.openapitools.codegen.*;
+import org.openapitools.codegen.java.assertions.JavaFileAssert;
 import org.openapitools.codegen.languages.JavaMicronautServerCodegen;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
 import static java.util.stream.Collectors.groupingBy;
 import static org.testng.Assert.assertEquals;
 
-public class MicronautServerCodegenTest extends AbstractMicronautCodegenTest {
+public class JavaMicronautServerCodegenTest extends AbstractMicronautCodegenTest {
     protected static String ROLES_EXTENSION_TEST_PATH = "src/test/resources/3_0/micronaut/roles-extension-test.yaml";
     protected static String MULTI_TAGS_TEST_PATH = "src/test/resources/3_0/micronaut/multi-tags-test.yaml";
 
@@ -341,4 +345,150 @@ public void doRepeatOperationForAllTags() {
         assertFileContains(controllerPath + "SearchController.java",
                 "authorSearchGet", "bookSearchGet");
     }
+
+    /**
+     * General XML annotations test (both JAXB and Jackson)
+     * <br>
+     * Includes regression tests for:
+     * - <a href="https://github.com/OpenAPITools/openapi-generator/issues/2417">Correct Jackson annotation when `wrapped: false`</a>
+     */
+    @Test public void shouldGenerateCorrectXmlAnnotations() throws IOException {
+        // Arrange
+        final String TEST_SPEC = "src/test/resources/3_0/java/xml-annotations-test.yaml";
+        final Path output = Files.createTempDirectory("test-xml-annotations_");
+        output.toFile().deleteOnExit();
+
+        JavaMicronautServerCodegen codegen = new JavaMicronautServerCodegen();
+        codegen.setWithXml(true);
+        codegen.setOutputDir(output.toString());
+
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false");
+        generator.setGenerateMetadata(false);
+
+        // Act
+        generator.opts(new ClientOptInput().config(codegen).openAPI(TestUtils.parseSpec(TEST_SPEC))).generate();
+
+        // Assert
+        JavaFileAssert.assertThat(output.resolve("src/main/java/org/openapitools/model/Pet.java").toFile())
+            .assertTypeAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD"))
+            .toType()
+
+            // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            .hasProperty("tags").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Tag\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"TagList\""))
+            .toProperty().toType()
+            .assertMethod("getTags").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Tag\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("friends").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"friend-pet\""))
+            .toProperty().toType()
+            .assertMethod("getFriends").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"friend-pet\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names)    
+            .hasProperty("status").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"PetStatus\""))
+            .toProperty().toType()
+            .assertMethod("getStatus").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"PetStatus\""))
+            .toMethod().toFileAssert()
+
+            // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays)
+            //   maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("photoUrls").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"photoUrls\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"photoUrls\""))
+            .toProperty().toType()
+            .assertMethod("getPhotoUrls").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"photoUrls\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute)
+            .hasProperty("name").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlElement")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlAttribute", Map.of("name", "\"name\""))
+            .toProperty().toType()
+            .assertMethod("getName").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\""))
+            .toMethod().toFileAssert()
+
+            // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces)
+            .hasProperty("id").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toProperty().toType()
+            .assertMethod("getId").assertMethodAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toMethod().toFileAssert()
+
+            // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("foods").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"yummy-yummy\""))
+            .toProperty().toType()
+            .assertMethod("getFoods").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\""))
+            .toMethod().toFileAssert()
+
+            // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("colors").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"color\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"colors\""))
+            .toProperty().toType()
+            .assertMethod("getColors").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"color\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"colors\""))
+            .toMethod().toFileAssert()
+
+            // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("categories").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Category\""))
+            .toProperty().toType()
+            .assertMethod("getCategories").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Category\""))
+            // ↓ specific regression test for #2417: (useWrapping=false) needs to be present
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            //   maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("activities").assertPropertyAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"item\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"activities-array\""))
+            .toProperty().toType()
+            .assertMethod("getActivities").assertMethodAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"item\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\""));
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
index cd7c21512dc9..21ae7fdb8e4f 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
@@ -17,60 +17,17 @@
 
 package org.openapitools.codegen.java.spring;
 
-import static java.util.stream.Collectors.groupingBy;
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.openapitools.codegen.TestUtils.assertFileContains;
-import static org.openapitools.codegen.TestUtils.assertFileNotContains;
-import static org.openapitools.codegen.languages.AbstractJavaCodegen.GENERATE_BUILDERS;
-import static org.openapitools.codegen.languages.AbstractJavaCodegen.GENERATE_CONSTRUCTOR_WITH_ALL_ARGS;
-import static org.openapitools.codegen.languages.SpringCodegen.ASYNC;
-import static org.openapitools.codegen.languages.SpringCodegen.DELEGATE_PATTERN;
-import static org.openapitools.codegen.languages.SpringCodegen.DocumentationProvider;
-import static org.openapitools.codegen.languages.SpringCodegen.IMPLICIT_HEADERS;
-import static org.openapitools.codegen.languages.SpringCodegen.INTERFACE_ONLY;
-import static org.openapitools.codegen.languages.SpringCodegen.OPENAPI_NULLABLE;
-import static org.openapitools.codegen.languages.SpringCodegen.REACTIVE;
-import static org.openapitools.codegen.languages.SpringCodegen.REQUEST_MAPPING_OPTION;
-import static org.openapitools.codegen.languages.SpringCodegen.RESPONSE_WRAPPER;
-import static org.openapitools.codegen.languages.SpringCodegen.RETURN_SUCCESS_CODE;
-import static org.openapitools.codegen.languages.SpringCodegen.SKIP_DEFAULT_INTERFACE;
-import static org.openapitools.codegen.languages.SpringCodegen.SPRING_BOOT;
-import static org.openapitools.codegen.languages.SpringCodegen.SPRING_CLOUD_LIBRARY;
-import static org.openapitools.codegen.languages.SpringCodegen.SPRING_CONTROLLER;
-import static org.openapitools.codegen.languages.SpringCodegen.SSE;
-import static org.openapitools.codegen.languages.SpringCodegen.USE_ENUM_CASE_INSENSITIVE;
-import static org.openapitools.codegen.languages.SpringCodegen.USE_RESPONSE_ENTITY;
-import static org.openapitools.codegen.languages.SpringCodegen.USE_SPRING_BOOT3;
-import static org.openapitools.codegen.languages.SpringCodegen.USE_TAGS;
-import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.ANNOTATION_LIBRARY;
-import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.DOCUMENTATION_PROVIDER;
-import static org.testng.Assert.assertEquals;
-import static org.testng.Assert.fail;
-
-import java.io.File;
-import java.io.IOException;
-import java.math.BigDecimal;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Consumer;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import com.google.common.collect.ImmutableMap;
+import io.swagger.parser.OpenAPIParser;
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.media.Schema;
+import io.swagger.v3.oas.models.servers.Server;
+import io.swagger.v3.parser.core.models.ParseOptions;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.api.MapAssert;
-import org.openapitools.codegen.CliOption;
-import org.openapitools.codegen.ClientOptInput;
-import org.openapitools.codegen.CodegenConstants;
-import org.openapitools.codegen.CodegenModel;
-import org.openapitools.codegen.CodegenOperation;
-import org.openapitools.codegen.CodegenParameter;
-import org.openapitools.codegen.CodegenProperty;
-import org.openapitools.codegen.DefaultGenerator;
-import org.openapitools.codegen.SupportingFile;
-import org.openapitools.codegen.TestUtils;
+import org.openapitools.codegen.*;
 import org.openapitools.codegen.config.CodegenConfigurator;
 import org.openapitools.codegen.config.GlobalSettings;
 import org.openapitools.codegen.java.assertions.JavaFileAssert;
@@ -85,15 +42,30 @@
 import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableMap;
+import java.io.File;
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
-import io.swagger.parser.OpenAPIParser;
-import io.swagger.v3.oas.models.OpenAPI;
-import io.swagger.v3.oas.models.Operation;
-import io.swagger.v3.oas.models.info.Info;
-import io.swagger.v3.oas.models.media.Schema;
-import io.swagger.v3.oas.models.servers.Server;
-import io.swagger.v3.parser.core.models.ParseOptions;
+import static java.util.stream.Collectors.groupingBy;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.openapitools.codegen.TestUtils.assertFileContains;
+import static org.openapitools.codegen.TestUtils.assertFileNotContains;
+import static org.openapitools.codegen.languages.AbstractJavaCodegen.GENERATE_BUILDERS;
+import static org.openapitools.codegen.languages.AbstractJavaCodegen.GENERATE_CONSTRUCTOR_WITH_ALL_ARGS;
+import static org.openapitools.codegen.languages.SpringCodegen.*;
+import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.ANNOTATION_LIBRARY;
+import static org.openapitools.codegen.languages.features.DocumentationProviderFeatures.DOCUMENTATION_PROVIDER;
+import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.fail;
 
 public class SpringCodegenTest {
 
@@ -4888,6 +4860,133 @@ public void testEnumUnknownDefaultCaseDeserializationNotSet_issue13241() throws
 
         JavaFileAssert.assertThat(files.get("Color.java"))
                 .assertMethod("fromValue").bodyContainsLines("throw new IllegalArgumentException(\"Unexpected value '\" + value + \"'\");");
+    }
+
+    /**
+     * General XML annotations test (both JAXB and Jackson)
+     * <br>
+     * Includes regression tests for:
+     * - <a href="https://github.com/OpenAPITools/openapi-generator/issues/2417">Correct Jackson annotation when `wrapped: false`</a>
+     */
+    @Test void shouldGenerateCorrectXmlAnnotations() throws IOException {
+        // Arrange
+        final String TEST_SPEC = "src/test/resources/3_0/java/xml-annotations-test.yaml"; 
+        final Path output = Files.createTempDirectory("test-xml-annotations_");
+        output.toFile().deleteOnExit();
+
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setLibrary(SPRING_BOOT);
+        codegen.setWithXml(true);
+        codegen.setOutputDir(output.toString());
 
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGenerateMetadata(false);
+
+        // Act
+        generator.opts(new ClientOptInput().config(codegen).openAPI(TestUtils.parseSpec(TEST_SPEC))).generate();
+
+        // Assert
+        JavaFileAssert.assertThat(output.resolve("src/main/java/org/openapitools/model/Pet.java").toFile())
+            .assertTypeAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD"))
+            .toType()
+
+            // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            .assertMethod("getTags").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Tag\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"TagList\""))
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Tag\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .assertMethod("getFriends").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"friend-pet\""))
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"friend-pet\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names)    
+            .assertMethod("getStatus").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"PetStatus\""))
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"PetStatus\""))
+            .toMethod().toFileAssert()
+            
+            // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays)
+            //   maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .assertMethod("getPhotoUrls").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"photoUrls\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"photoUrls\""))
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"photoUrls\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true"))
+            .toMethod().toFileAssert()
+
+            // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute)
+            .assertMethod("getName").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlElement")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlAttribute", Map.of("name", "\"name\""))
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes(
+                "JacksonXmlProperty",
+                Map.of("isAttribute", "true", "localName", "\"name\"")
+            )
+            .toMethod().toFileAssert()
+
+            // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces)
+            .assertMethod("getId").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toMethod().toFileAssert()
+
+            // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .assertMethod("getFoods").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\""))
+            .toMethod().toFileAssert()
+            
+            // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .assertMethod("getColors").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"color\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"colors\""))
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"color\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"colors\""))
+            .toMethod().toFileAssert()
+            
+            // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .assertMethod("getCategories").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .doesNotContainsWithName("XmlElementWrapper")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"Category\""))
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Category\""))
+            // ↓ specific regression test for #2417: (useWrapping=false) needs to be present
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toMethod().toFileAssert()
+
+            // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            //   maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .assertMethod("getActivities").assertMethodAnnotations()
+            .doesNotContainsWithName("XmlAttribute")
+            .containsWithNameAndAttributes("XmlElement", Map.of("name", "\"item\""))
+            .containsWithNameAndAttributes("XmlElementWrapper", Map.of("name", "\"activities-array\""))
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"item\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\""));
     }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegenTest.java
new file mode 100644
index 000000000000..25dbd04093f7
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/languages/JavaPKMSTServerCodegenTest.java
@@ -0,0 +1,112 @@
+package org.openapitools.codegen.languages;
+
+import org.openapitools.codegen.ClientOptInput;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.DefaultGenerator;
+import org.openapitools.codegen.TestUtils;
+import org.openapitools.codegen.java.assertions.JavaFileAssert;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+
+public class JavaPKMSTServerCodegenTest {
+
+    /**
+     * General XML annotations test (both JAXB and Jackson)
+     * <br>
+     * Includes regression tests for:
+     * - <a href="https://github.com/OpenAPITools/openapi-generator/issues/2417">Correct Jackson annotation when `wrapped: false`</a>
+     */
+    @Test public void shouldGenerateCorrectXmlAnnotations() throws IOException {
+        // Arrange
+        final String TEST_SPEC = "src/test/resources/3_0/java/xml-annotations-test.yaml";
+        final Path output = Files.createTempDirectory("test-xml-annotations_");
+        output.toFile().deleteOnExit();
+
+        JavaPKMSTServerCodegen codegen = new JavaPKMSTServerCodegen();
+        codegen.setWithXml(true);
+        codegen.setOutputDir(output.toString());
+
+        DefaultGenerator generator = new DefaultGenerator();
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODELS, "true");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_TESTS, "false");
+        generator.setGeneratorPropertyDefault(CodegenConstants.MODEL_DOCS, "false");
+        generator.setGenerateMetadata(false);
+
+        // Act
+        generator.opts(new ClientOptInput().config(codegen).openAPI(TestUtils.parseSpec(TEST_SPEC))).generate();
+
+        // Assert
+        JavaFileAssert.assertThat(output.resolve("src/main/java/com/prokarma/pkmst/model/Pet.java").toFile())
+            .assertTypeAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlRootElement", Map.of("localName", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlRootElement", Map.of("name", "\"Pet\"", "namespace", "\"urn:jacksonxml\""))
+            .containsWithNameAndAttributes("XmlAccessorType", Map.of("value", "XmlAccessType.FIELD"))
+            .toType()
+
+            // ↓ test custom-name on wrapper element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            .hasProperty("tags").assertPropertyAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Tag\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"TagList\"", "useWrapping", "true"))
+            .toProperty().toType()
+
+            // ↓ custom internal xml-array element name, non-wrapped (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("friends").assertPropertyAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"friend-pet\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toProperty().toType()
+
+            // ↓ test custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names)    
+            .hasProperty("status").assertPropertyAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"PetStatus\""))
+            .toProperty().toType()
+
+            // ↓ test same-name wrapping element (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Wrapping%20Arrays)
+            //   maps to 3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("photoUrls").assertPropertyAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"photoUrls\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"photoUrls\"", "useWrapping", "true"))
+            .toProperty().toType()
+
+            // ↓ test attribute generation (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Convert%20Property%20to%20an%20Attribute)
+            .hasProperty("name").assertPropertyAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("isAttribute", "true", "localName", "\"name\""))
+            .toProperty().toType()
+
+            // ↓ test XML namespace and prefix (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Prefixes%20and%20Namespaces)
+            .hasProperty("id").assertPropertyAnnotations()
+            .doesNotContainsWithName("JacksonXmlElementWrapper")
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"id\"", "namespace", "\"http://example.com/schema\""))
+            .toProperty().toType()
+
+            // ↓ external xml-array element name only (last example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("foods").assertPropertyAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"yummy-yummy\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"yummy-yummy\""))
+            .toProperty().toType()
+
+            // ↓ internal xml-array element name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("colors").assertPropertyAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"color\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"colors\""))
+            .toProperty().toType()
+
+            // ↓ ignored external xml-array element name, non-wrapped (2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            .hasProperty("categories").assertPropertyAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"Category\""))
+            // ↓ specific regression test for #2417: (useWrapping=false) needs to be present
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("useWrapping", "false"))
+            .toProperty().toType()
+
+            // ↓ test custom-name on wrapper AND children (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Use%20xml/name%20to%20give%20different%20names)
+            //   maps to 5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays
+            .hasProperty("activities").assertPropertyAnnotations()
+            .containsWithNameAndAttributes("JacksonXmlProperty", Map.of("localName", "\"item\""))
+            .containsWithNameAndAttributes("JacksonXmlElementWrapper", Map.of("localName", "\"activities-array\""));
+    }
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/3_0/java/xml-annotations-test.yaml b/modules/openapi-generator/src/test/resources/3_0/java/xml-annotations-test.yaml
new file mode 100644
index 000000000000..2b585377f5c6
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/3_0/java/xml-annotations-test.yaml
@@ -0,0 +1,142 @@
+openapi: 3.0.0
+info:
+  description: |
+    This spec is mainly for testing JAXB & Jackson XML annotation being generated correctly.
+    Some guidance:
+    - Jackson annotations: https://www.baeldung.com/jackson-xml-serialization-and-deserialization
+    - JAXB annotations: https://howtodoinjava.com/jaxb/xmlelementwrapper-annotation
+  version: 1.0.0
+  title: OpenAPI Petstore
+servers:
+  - url: 'https://localhost'
+paths:
+  /foo:
+    get:
+      operationId: foo
+      responses: 
+        '200':
+          description: response
+          content:
+            application/xml:
+              schema:
+                $ref: '#/components/schemas/Pet'
+components:
+  requestBodies:
+    Pet:
+      content:
+        application/json:
+          schema:
+            $ref: '#/components/schemas/Pet'
+        application/xml:
+          schema:
+            $ref: '#/components/schemas/Pet'
+      description: Pet object that needs to be added to the store
+      required: true
+  schemas:
+    Category:
+      type: object
+      required:
+        - name
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+          default: default-name
+      xml:
+        name: Category
+    Tag:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+      xml:
+        name: Tag
+    Pet:
+      type: object
+      required:
+        - name
+        - photoUrls
+      properties:
+        id:
+          type: integer
+          format: int64
+          x-is-unique: true
+          xml:
+            prefix: 'smp'
+            namespace: 'http://example.com/schema'
+        friends:  # non-wrapped with custom xml item element name (1st example in https://spec.openapis.org/oas/v3.0.0#xml-arrays) 
+          type: array
+          items:
+            type: string
+            xml:
+              name: friend-pet
+        categories:
+          type: array
+          items:
+            $ref: '#/components/schemas/Category'
+          xml:
+            wrapped: false  # This is the default value as per OAI spec anyway, just being explicit here for the test
+            # as per https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=For%20arrays: 
+            # »For arrays, the `xml/name` property works only if `xml/wrapped` is set to true. 
+            name: NotUsedAsNotWrapped # ← so this will not be used (see also 2nd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+        name:
+          type: string
+          example: doggie
+          xml:
+            attribute: true
+        photoUrls: # wrapped with no defined xml name (3rd example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+          type: array
+          xml:
+            wrapped: true
+          items:
+            type: string
+        colors: # wrapped with only internal xml name (4th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+          type: array
+          xml:
+            wrapped: true
+          items:
+            type: string
+            xml:
+              name: color
+        activities: # wrapped with both internal and external xml name (5th example in https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+          type: array
+          xml:
+            wrapped: true
+            name: activities-array
+          items:
+            type: string
+            xml:
+              name: item
+        foods:
+          type: array
+          items:
+            type: string
+          xml:
+            name: yummy-yummy # test case for changing external name, but not internal (last example at https://spec.openapis.org/oas/v3.0.0#xml-arrays)
+            wrapped: true
+        tags:
+          type: array
+          xml:
+            name: TagList
+            wrapped: true
+          items:
+            $ref: '#/components/schemas/Tag'
+            xml:
+              name: Ignored  # because sibling elements of `$ref`s are ignored (https://swagger.io/docs/specification/using-ref/)
+        status:
+          type: string
+          description: pet status in the store
+          enum:
+            - available
+            - pending
+            - sold
+          xml:
+            name: PetStatus # custom element name (https://swagger.io/docs/specification/data-models/representing-xml/#:~:text=Change%20Element%20Names)
+      xml:
+        name: Pet
+        namespace: 'urn:jacksonxml'
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
index 28b35f470715..e4957b4e19d1 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1485,10 +1485,11 @@ components:
         photoUrls:
           type: array
           xml:
-            name: photoUrl
             wrapped: true
           items:
             type: string
+            xml:
+              name: photoUrl
           uniqueItems: true
         tags:
           type: array
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java
index 4042a2248317..c880987aa9bd 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Bird.java
@@ -50,10 +50,10 @@ public Bird size(String size) {
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Bird color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java
index 988dcb8eb2c6..fd6052914b8e 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java
@@ -50,10 +50,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java
index f8c78a9d1818..89592197b82a 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -60,10 +60,10 @@ public DataQuery suffix(String suffix) {
     return this;
   }
 
-   /**
+  /**
    * test suffix
    * @return suffix
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SUFFIX)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,10 +85,10 @@ public DataQuery text(String text) {
     return this;
   }
 
-   /**
+  /**
    * Some text containing white spaces
    * @return text
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TEXT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -110,10 +110,10 @@ public DataQuery date(OffsetDateTime date) {
     return this;
   }
 
-   /**
+  /**
    * A date
    * @return date
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 2d36869f56cf..6a097c965f7a 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
@@ -127,10 +127,10 @@ public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEn
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumRefDefault
    * @return arrayStringEnumRefDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_REF_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -160,10 +160,10 @@ public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arr
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumDefault
    * @return arrayStringEnumDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -193,10 +193,10 @@ public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringDefault
    * @return arrayStringDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayIntegerDefault
    * @return arrayIntegerDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -259,10 +259,10 @@ public DefaultValue addArrayStringItem(String arrayStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayString
    * @return arrayString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -296,10 +296,10 @@ public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringNullable
    * @return arrayStringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -341,10 +341,10 @@ public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtens
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringExtensionNullable
    * @return arrayStringExtensionNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -374,10 +374,10 @@ public DefaultValue stringNullable(String stringNullable) {
     return this;
   }
 
-   /**
+  /**
    * Get stringNullable
    * @return stringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
index 66e1ac060e11..e8b3abb2da5d 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
@@ -55,10 +55,10 @@ public NumberPropertiesOnly number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * @return number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -80,10 +80,10 @@ public NumberPropertiesOnly _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -105,12 +105,12 @@ public NumberPropertiesOnly _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 0.8
    * maximum: 50.2
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java
index ecbe75aeb7f2..c5bb883ac0f9 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -158,10 +158,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -224,10 +224,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -249,10 +249,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java
index 0b6941388dc3..1e3447105f05 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Query.java
@@ -90,10 +90,10 @@ public Query id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Query
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -123,10 +123,10 @@ public Query addOutcomesItem(OutcomesEnum outcomesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get outcomes
    * @return outcomes
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTCOMES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java
index 7caaa9093808..4c6a374476e8 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,10 +50,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
index d30aa15102ef..dafba022e627 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
@@ -47,10 +47,10 @@ public TestFormObjectMultipartRequestMarker name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
index 524d6062ecab..2bee0d2b8b52 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
@@ -59,10 +59,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter size(S
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter color(
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -109,10 +109,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter id(Lon
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -134,10 +134,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter name(S
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index 285428be0d88..1cee1fef3336 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -58,10 +58,10 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter addValuesIte
     return this;
   }
 
-   /**
+  /**
    * Get values
    * @return values
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_VALUES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java
index c96cfa2f9c1a..4a1a0cf3d230 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Bird.java
@@ -44,10 +44,10 @@ public Bird size(String size) {
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSize() {
@@ -66,10 +66,10 @@ public Bird color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getColor() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
index 902b84b20346..c4b7113adb8d 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -44,10 +44,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -66,10 +66,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java
index fdac72f1b476..a3ae7944ef14 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -54,10 +54,10 @@ public DataQuery suffix(String suffix) {
     return this;
   }
 
-   /**
+  /**
    * test suffix
    * @return suffix
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSuffix() {
@@ -76,10 +76,10 @@ public DataQuery text(String text) {
     return this;
   }
 
-   /**
+  /**
    * Some text containing white spaces
    * @return text
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getText() {
@@ -98,10 +98,10 @@ public DataQuery date(OffsetDateTime date) {
     return this;
   }
 
-   /**
+  /**
    * A date
    * @return date
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDate() {
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 df0c9fd62df9..6eca8d3374f8 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
@@ -130,10 +130,10 @@ public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEn
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumRefDefault
    * @return arrayStringEnumRefDefault
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<StringEnumRef> getArrayStringEnumRefDefault() {
@@ -160,10 +160,10 @@ public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arr
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumDefault
    * @return arrayStringEnumDefault
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<ArrayStringEnumDefaultEnum> getArrayStringEnumDefault() {
@@ -190,10 +190,10 @@ public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringDefault
    * @return arrayStringDefault
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getArrayStringDefault() {
@@ -220,10 +220,10 @@ public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayIntegerDefault
    * @return arrayIntegerDefault
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getArrayIntegerDefault() {
@@ -250,10 +250,10 @@ public DefaultValue addArrayStringItem(String arrayStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayString
    * @return arrayString
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getArrayString() {
@@ -280,10 +280,10 @@ public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringNullable
    * @return arrayStringNullable
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getArrayStringNullable() {
@@ -310,10 +310,10 @@ public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtens
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringExtensionNullable
    * @return arrayStringExtensionNullable
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getArrayStringExtensionNullable() {
@@ -332,10 +332,10 @@ public DefaultValue stringNullable(String stringNullable) {
     return this;
   }
 
-   /**
+  /**
    * Get stringNullable
    * @return stringNullable
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getStringNullable() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
index 6f115daca233..e3e9cc4deac9 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
@@ -49,10 +49,10 @@ public NumberPropertiesOnly number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * @return number
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getNumber() {
@@ -71,10 +71,10 @@ public NumberPropertiesOnly _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
 
   public Float getFloat() {
@@ -93,12 +93,12 @@ public NumberPropertiesOnly _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 0.8
    * maximum: 50.2
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
 
   public Double getDouble() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
index fa5019288047..9eff7e479cc5 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -114,10 +114,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -136,10 +136,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getName() {
@@ -158,10 +158,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
 
   public Category getCategory() {
@@ -188,10 +188,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
 
   public List<String> getPhotoUrls() {
@@ -218,10 +218,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Tag> getTags() {
@@ -240,10 +240,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   public StatusEnum getStatus() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java
index f5f0ef60ab19..c6b425eafd7d 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Query.java
@@ -96,10 +96,10 @@ public Query id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Query
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -126,10 +126,10 @@ public Query addOutcomesItem(OutcomesEnum outcomesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get outcomes
    * @return outcomes
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<OutcomesEnum> getOutcomes() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
index 0efc621f6a66..03f852c6e7eb 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -44,10 +44,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -66,10 +66,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
index 968b3e844784..db627cbbaed7 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
@@ -40,10 +40,10 @@ public TestFormObjectMultipartRequestMarker name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
index 68e8d00753c1..ecef552a2c32 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
@@ -52,10 +52,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter size(S
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSize() {
@@ -74,10 +74,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter color(
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getColor() {
@@ -96,10 +96,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter id(Lon
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -118,10 +118,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter name(S
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index c7f36316bbf8..bc2e076e4784 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -51,10 +51,10 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter addValuesIte
     return this;
   }
 
-   /**
+  /**
    * Get values
    * @return values
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getValues() {
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java
index f6c0268eff8e..bf8c0d5f4ada 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Bird.java
@@ -52,14 +52,13 @@ public Bird size(String size) {
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSize() {
     return size;
   }
@@ -77,14 +76,13 @@ public Bird color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getColor() {
     return color;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java
index fde6c2983975..a6029a32e39a 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Category.java
@@ -52,14 +52,13 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java
index 699122d09e7c..c94db8ed3615 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -60,14 +60,13 @@ public DataQuery suffix(String suffix) {
     return this;
   }
 
-   /**
+  /**
    * test suffix
    * @return suffix
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SUFFIX)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSuffix() {
     return suffix;
   }
@@ -85,14 +84,13 @@ public DataQuery text(String text) {
     return this;
   }
 
-   /**
+  /**
    * Some text containing white spaces
    * @return text
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TEXT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getText() {
     return text;
   }
@@ -110,14 +108,13 @@ public DataQuery date(Instant date) {
     return this;
   }
 
-   /**
+  /**
    * A date
    * @return date
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Instant getDate() {
     return date;
   }
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 087ffb4cdbca..8a76e68aa234 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
@@ -128,14 +128,13 @@ public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEn
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumRefDefault
    * @return arrayStringEnumRefDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_REF_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<StringEnumRef> getArrayStringEnumRefDefault() {
     return arrayStringEnumRefDefault;
   }
@@ -161,14 +160,13 @@ public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arr
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumDefault
    * @return arrayStringEnumDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<ArrayStringEnumDefaultEnum> getArrayStringEnumDefault() {
     return arrayStringEnumDefault;
   }
@@ -194,14 +192,13 @@ public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringDefault
    * @return arrayStringDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<String> getArrayStringDefault() {
     return arrayStringDefault;
   }
@@ -227,14 +224,13 @@ public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayIntegerDefault
    * @return arrayIntegerDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Integer> getArrayIntegerDefault() {
     return arrayIntegerDefault;
   }
@@ -260,14 +256,13 @@ public DefaultValue addArrayStringItem(String arrayStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayString
    * @return arrayString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<String> getArrayString() {
     return arrayString;
   }
@@ -297,13 +292,12 @@ public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringNullable
    * @return arrayStringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public List<String> getArrayStringNullable() {
         return arrayStringNullable.orElse(null);
   }
@@ -342,13 +336,12 @@ public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtens
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringExtensionNullable
    * @return arrayStringExtensionNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public List<String> getArrayStringExtensionNullable() {
         return arrayStringExtensionNullable.orElse(null);
   }
@@ -375,13 +368,12 @@ public DefaultValue stringNullable(String stringNullable) {
     return this;
   }
 
-   /**
+  /**
    * Get stringNullable
    * @return stringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public String getStringNullable() {
         return stringNullable.orElse(null);
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
index 431081d5e2fd..766e70f6672b 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
@@ -57,14 +57,13 @@ public NumberPropertiesOnly number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * @return number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getNumber() {
     return number;
   }
@@ -82,14 +81,13 @@ public NumberPropertiesOnly _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Float getFloat() {
     return _float;
   }
@@ -107,16 +105,15 @@ public NumberPropertiesOnly _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 0.8
    * maximum: 50.2
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Double getDouble() {
     return _double;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java
index 3d59e13e74dc..0b3ba525fd70 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,14 +109,13 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -134,14 +133,13 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getName() {
     return name;
   }
@@ -159,14 +157,13 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Category getCategory() {
     return category;
   }
@@ -192,14 +189,13 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -225,14 +221,13 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Tag> getTags() {
     return tags;
   }
@@ -250,14 +245,13 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java
index 3516d42378d1..5666e1f83919 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Query.java
@@ -91,14 +91,13 @@ public Query id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Query
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -124,14 +123,13 @@ public Query addOutcomesItem(OutcomesEnum outcomesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get outcomes
    * @return outcomes
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTCOMES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<OutcomesEnum> getOutcomes() {
     return outcomes;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java
index 3b5269ef194d..8d7bbe0fb041 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/Tag.java
@@ -52,14 +52,13 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
index 2daf35f63cc9..965b689868eb 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
@@ -48,14 +48,13 @@ public TestFormObjectMultipartRequestMarker name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
index d6a413b441ce..ff12141d574e 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
@@ -60,14 +60,13 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter size(S
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSize() {
     return size;
   }
@@ -85,14 +84,13 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter color(
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getColor() {
     return color;
   }
@@ -110,14 +108,13 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter id(Lon
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -135,14 +132,13 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter name(S
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index c66f16d3a30b..b4ef260240b5 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -58,14 +58,13 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter addValuesIte
     return this;
   }
 
-   /**
+  /**
    * Get values
    * @return values
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_VALUES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<String> getValues() {
     return values;
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Category.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Category.java
index fcb1ecc95080..6a5bc706a55b 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Category.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Category.java
@@ -78,12 +78,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -129,22 +129,22 @@ public Category read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/ModelApiResponse.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/ModelApiResponse.java
index 7ac993095622..c4944e84356b 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/ModelApiResponse.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/ModelApiResponse.java
@@ -78,12 +78,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -129,22 +129,22 @@ public ModelApiResponse read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Order.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Order.java
index 2ae1373fb142..37bd4dffbd27 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Order.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Order.java
@@ -78,12 +78,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -129,22 +129,22 @@ public Order read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Pet.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Pet.java
index 497222678153..dd8871707e14 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Pet.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Pet.java
@@ -78,12 +78,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -129,22 +129,22 @@ public Pet read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Tag.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Tag.java
index 8aaa07aad997..b1d3f81dbf7d 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Tag.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/Tag.java
@@ -78,12 +78,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -129,22 +129,22 @@ public Tag read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/User.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/User.java
index d3040094c259..9aafd2ed6c4d 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/User.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/modelCopy/User.java
@@ -78,12 +78,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -129,22 +129,22 @@ public User read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Category.java
index 18b7e9784c0b..15c5ecf92553 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -154,12 +154,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -209,22 +209,22 @@ public Category read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index fd5033b66f50..f83f476a932f 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -71,10 +71,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -90,10 +90,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -180,12 +180,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -238,22 +238,22 @@ public ModelApiResponse read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java
index 8f3d5be6fc29..bf9cc6ebce74 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Order.java
@@ -138,10 +138,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -157,10 +157,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -176,10 +176,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -195,10 +195,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -313,12 +313,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -372,22 +372,22 @@ public Order read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java
index d2c4faf698e9..9484a7c990b1 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Pet.java
@@ -142,10 +142,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -161,10 +161,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -180,10 +180,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -207,10 +207,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -234,10 +234,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -254,11 +254,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
@@ -339,12 +339,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -432,22 +432,22 @@ public Pet read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Tag.java
index 096390e03d8e..46b64b0d63bd 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -154,12 +154,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -209,22 +209,22 @@ public Tag read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/User.java b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/User.java
index a299b46e3306..45add60fb35f 100644
--- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/src/main/java/org/openapitools/client/model/User.java
@@ -91,10 +91,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -129,10 +129,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -167,10 +167,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -186,10 +186,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -205,10 +205,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -224,10 +224,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -310,12 +310,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -380,22 +380,22 @@ public User read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Bird.java
index bd487c9c3f00..724423051758 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Bird.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Bird.java
@@ -67,10 +67,10 @@ public Bird size(String size) {
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   public String getSize() {
     return size;
@@ -86,10 +86,10 @@ public Bird color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   public String getColor() {
     return color;
@@ -154,12 +154,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Bird
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Bird
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Bird.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -212,22 +212,22 @@ public Bird read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Bird given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Bird
-  * @throws IOException if the JSON string is invalid with respect to Bird
-  */
+  /**
+   * Create an instance of Bird given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Bird
+   * @throws IOException if the JSON string is invalid with respect to Bird
+   */
   public static Bird fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Bird.class);
   }
 
- /**
-  * Convert an instance of Bird to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Bird to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
index f95187c6999e..9fecfb9b3f45 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -154,12 +154,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -209,22 +209,22 @@ public Category read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java
index 371876ce860e..c92fe9ea4bbc 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -75,10 +75,10 @@ public DataQuery suffix(String suffix) {
     return this;
   }
 
-   /**
+  /**
    * test suffix
    * @return suffix
-  **/
+   */
   @javax.annotation.Nullable
   public String getSuffix() {
     return suffix;
@@ -94,10 +94,10 @@ public DataQuery text(String text) {
     return this;
   }
 
-   /**
+  /**
    * Some text containing white spaces
    * @return text
-  **/
+   */
   @javax.annotation.Nullable
   public String getText() {
     return text;
@@ -113,10 +113,10 @@ public DataQuery date(OffsetDateTime date) {
     return this;
   }
 
-   /**
+  /**
    * A date
    * @return date
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDate() {
     return date;
@@ -188,12 +188,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to DataQuery
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to DataQuery
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!DataQuery.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -246,22 +246,22 @@ public DataQuery read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of DataQuery given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of DataQuery
-  * @throws IOException if the JSON string is invalid with respect to DataQuery
-  */
+  /**
+   * Create an instance of DataQuery given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of DataQuery
+   * @throws IOException if the JSON string is invalid with respect to DataQuery
+   */
   public static DataQuery fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, DataQuery.class);
   }
 
- /**
-  * Convert an instance of DataQuery to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of DataQuery to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 29f96bf92f55..4906270fec60 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
@@ -157,10 +157,10 @@ public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEn
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumRefDefault
    * @return arrayStringEnumRefDefault
-  **/
+   */
   @javax.annotation.Nullable
   public List<StringEnumRef> getArrayStringEnumRefDefault() {
     return arrayStringEnumRefDefault;
@@ -184,10 +184,10 @@ public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arr
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumDefault
    * @return arrayStringEnumDefault
-  **/
+   */
   @javax.annotation.Nullable
   public List<ArrayStringEnumDefaultEnum> getArrayStringEnumDefault() {
     return arrayStringEnumDefault;
@@ -211,10 +211,10 @@ public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringDefault
    * @return arrayStringDefault
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayStringDefault() {
     return arrayStringDefault;
@@ -238,10 +238,10 @@ public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayIntegerDefault
    * @return arrayIntegerDefault
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getArrayIntegerDefault() {
     return arrayIntegerDefault;
@@ -265,10 +265,10 @@ public DefaultValue addArrayStringItem(String arrayStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayString
    * @return arrayString
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayString() {
     return arrayString;
@@ -292,10 +292,10 @@ public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringNullable
    * @return arrayStringNullable
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayStringNullable() {
     return arrayStringNullable;
@@ -319,10 +319,10 @@ public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtens
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringExtensionNullable
    * @return arrayStringExtensionNullable
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayStringExtensionNullable() {
     return arrayStringExtensionNullable;
@@ -338,10 +338,10 @@ public DefaultValue stringNullable(String stringNullable) {
     return this;
   }
 
-   /**
+  /**
    * Get stringNullable
    * @return stringNullable
-  **/
+   */
   @javax.annotation.Nullable
   public String getStringNullable() {
     return stringNullable;
@@ -435,12 +435,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to DefaultValue
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to DefaultValue
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!DefaultValue.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -518,22 +518,22 @@ public DefaultValue read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of DefaultValue given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of DefaultValue
-  * @throws IOException if the JSON string is invalid with respect to DefaultValue
-  */
+  /**
+   * Create an instance of DefaultValue given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of DefaultValue
+   * @throws IOException if the JSON string is invalid with respect to DefaultValue
+   */
   public static DefaultValue fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, DefaultValue.class);
   }
 
- /**
-  * Convert an instance of DefaultValue to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of DefaultValue to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
index fe0b947180db..247b0115f54d 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
@@ -72,10 +72,10 @@ public NumberPropertiesOnly number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * @return number
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getNumber() {
     return number;
@@ -91,10 +91,10 @@ public NumberPropertiesOnly _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   public Float getFloat() {
     return _float;
@@ -110,12 +110,12 @@ public NumberPropertiesOnly _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 0.8
    * maximum: 50.2
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   public Double getDouble() {
     return _double;
@@ -183,12 +183,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NumberPropertiesOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NumberPropertiesOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NumberPropertiesOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -235,22 +235,22 @@ public NumberPropertiesOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of NumberPropertiesOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NumberPropertiesOnly
-  * @throws IOException if the JSON string is invalid with respect to NumberPropertiesOnly
-  */
+  /**
+   * Create an instance of NumberPropertiesOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NumberPropertiesOnly
+   * @throws IOException if the JSON string is invalid with respect to NumberPropertiesOnly
+   */
   public static NumberPropertiesOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NumberPropertiesOnly.class);
   }
 
- /**
-  * Convert an instance of NumberPropertiesOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NumberPropertiesOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(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 248eec6e0bb4..82fe4d6aa38f 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
@@ -141,10 +141,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -160,10 +160,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -179,10 +179,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -206,10 +206,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -233,10 +233,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -252,10 +252,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -334,12 +334,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -427,22 +427,22 @@ public Pet read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 789437a4feea..7b88af11b571 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
@@ -123,10 +123,10 @@ public Query id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Query
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -150,10 +150,10 @@ public Query addOutcomesItem(OutcomesEnum outcomesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get outcomes
    * @return outcomes
-  **/
+   */
   @javax.annotation.Nullable
   public List<OutcomesEnum> getOutcomes() {
     return outcomes;
@@ -218,12 +218,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Query
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Query
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Query.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -238,22 +238,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of Query given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Query
-  * @throws IOException if the JSON string is invalid with respect to Query
-  */
+  /**
+   * Create an instance of Query given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Query
+   * @throws IOException if the JSON string is invalid with respect to Query
+   */
   public static Query fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Query.class);
   }
 
- /**
-  * Convert an instance of Query to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Query to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
index 0cf831b48913..be0f989c6336 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -154,12 +154,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -209,22 +209,22 @@ public Tag read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
index 7ca81e409a11..309a6112ac29 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
@@ -63,10 +63,10 @@ public TestFormObjectMultipartRequestMarker name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -128,12 +128,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TestFormObjectMultipartRequestMarker
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TestFormObjectMultipartRequestMarker
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TestFormObjectMultipartRequestMarker.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -183,22 +183,22 @@ public TestFormObjectMultipartRequestMarker read(JsonReader in) throws IOExcepti
     }
   }
 
- /**
-  * Create an instance of TestFormObjectMultipartRequestMarker given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TestFormObjectMultipartRequestMarker
-  * @throws IOException if the JSON string is invalid with respect to TestFormObjectMultipartRequestMarker
-  */
+  /**
+   * Create an instance of TestFormObjectMultipartRequestMarker given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TestFormObjectMultipartRequestMarker
+   * @throws IOException if the JSON string is invalid with respect to TestFormObjectMultipartRequestMarker
+   */
   public static TestFormObjectMultipartRequestMarker fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TestFormObjectMultipartRequestMarker.class);
   }
 
- /**
-  * Convert an instance of TestFormObjectMultipartRequestMarker to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TestFormObjectMultipartRequestMarker to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
index 1416cbc94ec1..7c922da1d9d9 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
@@ -75,10 +75,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter size(S
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   public String getSize() {
     return size;
@@ -94,10 +94,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter color(
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   public String getColor() {
     return color;
@@ -113,10 +113,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter id(Lon
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -132,10 +132,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter name(S
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -206,12 +206,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -267,22 +267,22 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter read(J
     }
   }
 
- /**
-  * Create an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
-  * @throws IOException if the JSON string is invalid with respect to TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
-  */
+  /**
+   * Create an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
+   * @throws IOException if the JSON string is invalid with respect to TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter
+   */
   public static TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.class);
   }
 
- /**
-  * Convert an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 6d9a17f5b8d6..2d501a2fcb75 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
@@ -73,10 +73,10 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter addValuesIte
     return this;
   }
 
-   /**
+  /**
    * Get values
    * @return values
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getValues() {
     return values;
@@ -138,12 +138,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -194,22 +194,22 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter read(JsonRea
     }
   }
 
- /**
-  * Create an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
-  * @throws IOException if the JSON string is invalid with respect to TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
-  */
+  /**
+   * Create an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
+   * @throws IOException if the JSON string is invalid with respect to TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter
+   */
   public static TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.class);
   }
 
- /**
-  * Convert an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Bird.java
index 531de298dfa1..040c10ac7420 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Bird.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Bird.java
@@ -47,10 +47,10 @@ public Bird size(String size) {
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Bird color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Category.java
index 2bdf8db6f756..8beed82c457b 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java
index 4de08e28865f..e1e196ff0d71 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -57,10 +57,10 @@ public DataQuery suffix(String suffix) {
     return this;
   }
 
-   /**
+  /**
    * test suffix
    * @return suffix
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SUFFIX)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -82,10 +82,10 @@ public DataQuery text(String text) {
     return this;
   }
 
-   /**
+  /**
    * Some text containing white spaces
    * @return text
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TEXT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -107,10 +107,10 @@ public DataQuery date(Instant date) {
     return this;
   }
 
-   /**
+  /**
    * A date
    * @return date
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DefaultValue.java
index 298cdac6629f..808b204b784c 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DefaultValue.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DefaultValue.java
@@ -124,10 +124,10 @@ public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEn
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumRefDefault
    * @return arrayStringEnumRefDefault
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_REF_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -157,10 +157,10 @@ public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arr
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumDefault
    * @return arrayStringEnumDefault
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -190,10 +190,10 @@ public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringDefault
    * @return arrayStringDefault
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -223,10 +223,10 @@ public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayIntegerDefault
    * @return arrayIntegerDefault
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -256,10 +256,10 @@ public DefaultValue addArrayStringItem(String arrayStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayString
    * @return arrayString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringNullable
    * @return arrayStringNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -338,10 +338,10 @@ public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtens
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringExtensionNullable
    * @return arrayStringExtensionNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -371,10 +371,10 @@ public DefaultValue stringNullable(String stringNullable) {
     return this;
   }
 
-   /**
+  /**
    * Get stringNullable
    * @return stringNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
index 70d214eb16f2..a95564c73ca6 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
@@ -52,10 +52,10 @@ public NumberPropertiesOnly number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * @return number
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public NumberPropertiesOnly _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * @return _float
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,12 +102,12 @@ public NumberPropertiesOnly _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 0.8
    * maximum: 50.2
    * @return _double
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Pet.java
index 5d871c381e14..9497767a70c8 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -105,10 +105,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -155,10 +155,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -221,10 +221,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Query.java
index b177d32db03f..8140d9598742 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Query.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Query.java
@@ -87,10 +87,10 @@ public Query id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Query
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -120,10 +120,10 @@ public Query addOutcomesItem(OutcomesEnum outcomesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get outcomes
    * @return outcomes
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTCOMES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Tag.java
index ab233fab0389..bd309e78cb2e 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
index 33efa33075c2..ed371dfe7fba 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
@@ -44,10 +44,10 @@ public TestFormObjectMultipartRequestMarker name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
index 77682f88a695..ce937de2e58e 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
@@ -56,10 +56,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter size(S
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter color(
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter id(Lon
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -131,10 +131,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter name(S
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index 66802d730e28..e0049b304004 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -55,10 +55,10 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter addValuesIte
     return this;
   }
 
-   /**
+  /**
    * Get values
    * @return values
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_VALUES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Bird.java
index 3746b7346907..2f2aa39db009 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Bird.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Bird.java
@@ -47,10 +47,10 @@ public Bird size(String size) {
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Bird color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
index 2a9fa4dfa002..32f837ac95ad 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java
index 5d1bc1e03c0c..707eaa1c7233 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -57,10 +57,10 @@ public DataQuery suffix(String suffix) {
     return this;
   }
 
-   /**
+  /**
    * test suffix
    * @return suffix
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SUFFIX)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -82,10 +82,10 @@ public DataQuery text(String text) {
     return this;
   }
 
-   /**
+  /**
    * Some text containing white spaces
    * @return text
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TEXT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -107,10 +107,10 @@ public DataQuery date(OffsetDateTime date) {
     return this;
   }
 
-   /**
+  /**
    * A date
    * @return date
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java
index 84a4ee82bcf8..7352ecd6efb8 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DefaultValue.java
@@ -124,10 +124,10 @@ public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEn
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumRefDefault
    * @return arrayStringEnumRefDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_REF_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -157,10 +157,10 @@ public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arr
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumDefault
    * @return arrayStringEnumDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -190,10 +190,10 @@ public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringDefault
    * @return arrayStringDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -223,10 +223,10 @@ public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayIntegerDefault
    * @return arrayIntegerDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -256,10 +256,10 @@ public DefaultValue addArrayStringItem(String arrayStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayString
    * @return arrayString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringNullable
    * @return arrayStringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -338,10 +338,10 @@ public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtens
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringExtensionNullable
    * @return arrayStringExtensionNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -371,10 +371,10 @@ public DefaultValue stringNullable(String stringNullable) {
     return this;
   }
 
-   /**
+  /**
    * Get stringNullable
    * @return stringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
index c1b5b4217b27..756b0c0fccc9 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
@@ -52,10 +52,10 @@ public NumberPropertiesOnly number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * @return number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public NumberPropertiesOnly _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,12 +102,12 @@ public NumberPropertiesOnly _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 0.8
    * maximum: 50.2
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
index 0a7d248f2445..b931a58a0ab8 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
@@ -105,10 +105,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -155,10 +155,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -221,10 +221,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java
index fe08f4a195bb..076438bbe80a 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Query.java
@@ -87,10 +87,10 @@ public Query id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Query
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -120,10 +120,10 @@ public Query addOutcomesItem(OutcomesEnum outcomesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get outcomes
    * @return outcomes
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTCOMES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
index 17571cb57480..d58ba7be7790 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
index 6de1e928f80f..2fd8d7ee4fbe 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
@@ -44,10 +44,10 @@ public TestFormObjectMultipartRequestMarker name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
index fd228d152750..74273d4d4727 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
@@ -56,10 +56,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter size(S
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter color(
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter id(Lon
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -131,10 +131,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter name(S
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index 26099b802e70..441bbdfca4fe 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -55,10 +55,10 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter addValuesIte
     return this;
   }
 
-   /**
+  /**
    * Get values
    * @return values
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_VALUES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Bird.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Bird.java
index 3746b7346907..2f2aa39db009 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Bird.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Bird.java
@@ -47,10 +47,10 @@ public Bird size(String size) {
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Bird color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
index 2a9fa4dfa002..32f837ac95ad 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java
index 5d1bc1e03c0c..707eaa1c7233 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -57,10 +57,10 @@ public DataQuery suffix(String suffix) {
     return this;
   }
 
-   /**
+  /**
    * test suffix
    * @return suffix
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SUFFIX)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -82,10 +82,10 @@ public DataQuery text(String text) {
     return this;
   }
 
-   /**
+  /**
    * Some text containing white spaces
    * @return text
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TEXT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -107,10 +107,10 @@ public DataQuery date(OffsetDateTime date) {
     return this;
   }
 
-   /**
+  /**
    * A date
    * @return date
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DefaultValue.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DefaultValue.java
index c6ac0e12d5c2..999e5c48df00 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DefaultValue.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DefaultValue.java
@@ -124,10 +124,10 @@ public DefaultValue addArrayStringEnumRefDefaultItem(StringEnumRef arrayStringEn
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumRefDefault
    * @return arrayStringEnumRefDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_REF_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -157,10 +157,10 @@ public DefaultValue addArrayStringEnumDefaultItem(ArrayStringEnumDefaultEnum arr
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringEnumDefault
    * @return arrayStringEnumDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_ENUM_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -190,10 +190,10 @@ public DefaultValue addArrayStringDefaultItem(String arrayStringDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringDefault
    * @return arrayStringDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -223,10 +223,10 @@ public DefaultValue addArrayIntegerDefaultItem(Integer arrayIntegerDefaultItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayIntegerDefault
    * @return arrayIntegerDefault
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_INTEGER_DEFAULT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -256,10 +256,10 @@ public DefaultValue addArrayStringItem(String arrayStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayString
    * @return arrayString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public DefaultValue addArrayStringNullableItem(String arrayStringNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringNullable
    * @return arrayStringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -338,10 +338,10 @@ public DefaultValue addArrayStringExtensionNullableItem(String arrayStringExtens
     return this;
   }
 
-   /**
+  /**
    * Get arrayStringExtensionNullable
    * @return arrayStringExtensionNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -371,10 +371,10 @@ public DefaultValue stringNullable(String stringNullable) {
     return this;
   }
 
-   /**
+  /**
    * Get stringNullable
    * @return stringNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
index c1b5b4217b27..756b0c0fccc9 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/NumberPropertiesOnly.java
@@ -52,10 +52,10 @@ public NumberPropertiesOnly number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * @return number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public NumberPropertiesOnly _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,12 +102,12 @@ public NumberPropertiesOnly _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 0.8
    * maximum: 50.2
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
index a1ec50027ecb..1759f2a147b0 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
@@ -105,10 +105,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -155,10 +155,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -221,10 +221,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Query.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Query.java
index fe08f4a195bb..076438bbe80a 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Query.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Query.java
@@ -87,10 +87,10 @@ public Query id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Query
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -120,10 +120,10 @@ public Query addOutcomesItem(OutcomesEnum outcomesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get outcomes
    * @return outcomes
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTCOMES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
index 17571cb57480..d58ba7be7790 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
index 6de1e928f80f..2fd8d7ee4fbe 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestFormObjectMultipartRequestMarker.java
@@ -44,10 +44,10 @@ public TestFormObjectMultipartRequestMarker name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
index fd228d152750..74273d4d4727 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter.java
@@ -56,10 +56,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter size(S
     return this;
   }
 
-   /**
+  /**
    * Get size
    * @return size
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SIZE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter color(
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter id(Lon
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -131,10 +131,10 @@ public TestQueryStyleDeepObjectExplodeTrueObjectAllOfQueryObjectParameter name(S
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
index a51bf0e70166..4a35e411aa26 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter.java
@@ -55,10 +55,10 @@ public TestQueryStyleFormExplodeTrueArrayStringQueryObjectParameter addValuesIte
     return this;
   }
 
-   /**
+  /**
    * Get values
    * @return values
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_VALUES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
index 4cfec8012af8..11664b18ac3a 100644
--- a/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
+++ b/samples/client/others/java/okhttp-gson-streaming/src/main/java/org/openapitools/client/model/SomeObj.java
@@ -132,10 +132,10 @@ public SomeObj() {
     return this;
   }
 
-   /**
+  /**
    * Get $type
    * @return $type
-  **/
+   */
   @javax.annotation.Nullable
   public TypeEnum get$Type() {
     return $type;
@@ -151,10 +151,10 @@ public SomeObj id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -170,10 +170,10 @@ public SomeObj name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -189,10 +189,10 @@ public SomeObj active(Boolean active) {
     return this;
   }
 
-   /**
+  /**
    * Get active
    * @return active
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getActive() {
     return active;
@@ -208,10 +208,10 @@ public SomeObj type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -285,12 +285,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to SomeObj
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to SomeObj
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!SomeObj.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -350,22 +350,22 @@ public SomeObj read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of SomeObj given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of SomeObj
-  * @throws IOException if the JSON string is invalid with respect to SomeObj
-  */
+  /**
+   * Create an instance of SomeObj given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of SomeObj
+   * @throws IOException if the JSON string is invalid with respect to SomeObj
+   */
   public static SomeObj fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, SomeObj.class);
   }
 
- /**
-  * Convert an instance of SomeObj to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of SomeObj to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 72c1b92e5bf1..751ee308bd97 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -47,7 +47,7 @@ public AdditionalPropertiesAnyType name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 135804b4af4d..e68ad400c816 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -48,7 +48,7 @@ public AdditionalPropertiesArray name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index ba9a839b9eb9..e063a4793787 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -47,7 +47,7 @@ public AdditionalPropertiesBoolean name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 5d879a3eeb91..01d431631f24 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -96,7 +96,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     /**
      * Get mapString
      * @return mapString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,7 +126,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     /**
      * Get mapNumber
      * @return mapNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -156,7 +156,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     /**
      * Get mapInteger
      * @return mapInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -186,7 +186,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     /**
      * Get mapBoolean
      * @return mapBoolean
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -216,7 +216,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     /**
      * Get mapArrayInteger
      * @return mapArrayInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,7 +246,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     /**
      * Get mapArrayAnytype
      * @return mapArrayAnytype
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -276,7 +276,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     /**
      * Get mapMapString
      * @return mapMapString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -306,7 +306,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     /**
      * Get mapMapAnytype
      * @return mapMapAnytype
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -328,7 +328,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     /**
      * Get anytype1
      * @return anytype1
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ANYTYPE1)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -350,7 +350,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     /**
      * Get anytype2
      * @return anytype2
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ANYTYPE2)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -372,7 +372,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     /**
      * Get anytype3
      * @return anytype3
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ANYTYPE3)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index c2dcb1eef058..98a70e395698 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -47,7 +47,7 @@ public AdditionalPropertiesInteger name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 2652c934c679..88bf59894b9a 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -48,7 +48,7 @@ public AdditionalPropertiesNumber name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 5af7e11264de..0c3fe94c6baa 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -47,7 +47,7 @@ public AdditionalPropertiesObject name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index c60a99749644..1adde2d5b187 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -47,7 +47,7 @@ public AdditionalPropertiesString name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java
index 12ac62ac836a..05e99866333c 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Animal.java
@@ -62,7 +62,7 @@ public Animal className(String className) {
     /**
      * Get className
      * @return className
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_CLASS_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -84,7 +84,7 @@ public Animal color(String color) {
     /**
      * Get color
      * @return color
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_COLOR)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index dfed5b6690e1..e26d52d9becf 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -56,7 +56,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     /**
      * Get arrayArrayNumber
      * @return arrayArrayNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 817241686aea..421b8ba9e047 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -56,7 +56,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     /**
      * Get arrayNumber
      * @return arrayNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java
index 59fea43ceff8..05c54b740294 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ArrayTest.java
@@ -64,7 +64,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     /**
      * Get arrayOfString
      * @return arrayOfString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -94,7 +94,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     /**
      * Get arrayArrayOfInteger
      * @return arrayArrayOfInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -124,7 +124,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
     /**
      * Get arrayArrayOfModel
      * @return arrayArrayOfModel
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java
index 795a02b3b612..4917a7d00809 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/BigCat.java
@@ -81,7 +81,7 @@ public BigCat kind(KindEnum kind) {
     /**
      * Get kind
      * @return kind
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_KIND)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java
index a61fa57df646..2751b6502b12 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Capitalization.java
@@ -64,7 +64,7 @@ public Capitalization smallCamel(String smallCamel) {
     /**
      * Get smallCamel
      * @return smallCamel
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -86,7 +86,7 @@ public Capitalization capitalCamel(String capitalCamel) {
     /**
      * Get capitalCamel
      * @return capitalCamel
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -108,7 +108,7 @@ public Capitalization smallSnake(String smallSnake) {
     /**
      * Get smallSnake
      * @return smallSnake
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,7 +130,7 @@ public Capitalization capitalSnake(String capitalSnake) {
     /**
      * Get capitalSnake
      * @return capitalSnake
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -152,7 +152,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     /**
      * Get scAETHFlowPoints
      * @return scAETHFlowPoints
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -174,7 +174,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     /**
      * Name of the pet 
      * @return ATT_NAME
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java
index 9f65c7d956d6..34a4c43188a6 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Cat.java
@@ -46,7 +46,7 @@ public Cat declawed(Boolean declawed) {
     /**
      * Get declawed
      * @return declawed
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_DECLAWED)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java
index 27c31fca8128..fdb9ea50be86 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Category.java
@@ -48,7 +48,7 @@ public Category id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -70,7 +70,7 @@ public Category name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java
index 524149166a73..19eed56cc814 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ClassModel.java
@@ -44,7 +44,7 @@ public ClassModel propertyClass(String propertyClass) {
     /**
      * Get propertyClass
      * @return propertyClass
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java
index e86fe566d684..afe3ab2f5abc 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Dog.java
@@ -46,7 +46,7 @@ public Dog breed(String breed) {
     /**
      * Get breed
      * @return breed
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_BREED)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java
index 17524d4aca93..8b8308af8ed7 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumArrays.java
@@ -117,7 +117,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     /**
      * Get justSymbol
      * @return justSymbol
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -147,7 +147,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     /**
      * Get arrayEnum
      * @return arrayEnum
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java
index e5d83e3e7d1e..7c3abe22a995 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/EnumTest.java
@@ -196,7 +196,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
     /**
      * Get enumString
      * @return enumString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ENUM_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -218,7 +218,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     /**
      * Get enumStringRequired
      * @return enumStringRequired
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -240,7 +240,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     /**
      * Get enumInteger
      * @return enumInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -262,7 +262,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     /**
      * Get enumNumber
      * @return enumNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -284,7 +284,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     /**
      * Get outerEnum
      * @return outerEnum
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 30db6dde0ffa..0dd93420f383 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -52,7 +52,7 @@ public FileSchemaTestClass _file(ModelFile _file) {
     /**
      * Get _file
      * @return _file
-     **/
+     */
     @Valid
     @Nullable
     @JsonProperty(JSON_PROPERTY_FILE)
@@ -83,7 +83,7 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     /**
      * Get files
      * @return files
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_FILES)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java
index f21bd1fb6482..e97eef3f68ac 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java
@@ -104,7 +104,7 @@ public FormatTest integer(Integer integer) {
      * minimum: 10
      * maximum: 100
      * @return integer
-     **/
+     */
     @Nullable
     @Min(10)
     @Max(100)
@@ -130,7 +130,7 @@ public FormatTest int32(Integer int32) {
      * minimum: 20
      * maximum: 200
      * @return int32
-     **/
+     */
     @Nullable
     @Min(20)
     @Max(200)
@@ -154,7 +154,7 @@ public FormatTest int64(Long int64) {
     /**
      * Get int64
      * @return int64
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_INT64)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -178,7 +178,7 @@ public FormatTest number(BigDecimal number) {
      * minimum: 32.1
      * maximum: 543.2
      * @return number
-     **/
+     */
     @NotNull
     @DecimalMin("32.1")
     @DecimalMax("543.2")
@@ -204,7 +204,7 @@ public FormatTest _float(Float _float) {
      * minimum: 54.3
      * maximum: 987.6
      * @return _float
-     **/
+     */
     @Nullable
     @DecimalMin("54.3")
     @DecimalMax("987.6")
@@ -230,7 +230,7 @@ public FormatTest _double(Double _double) {
      * minimum: 67.8
      * maximum: 123.4
      * @return _double
-     **/
+     */
     @Nullable
     @DecimalMin("67.8")
     @DecimalMax("123.4")
@@ -254,7 +254,7 @@ public FormatTest string(String string) {
     /**
      * Get string
      * @return string
-     **/
+     */
     @Nullable
     @Pattern(regexp="/[a-z]/i")
     @JsonProperty(JSON_PROPERTY_STRING)
@@ -277,7 +277,7 @@ public FormatTest _byte(byte[] _byte) {
     /**
      * Get _byte
      * @return _byte
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_BYTE)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -299,7 +299,7 @@ public FormatTest binary(File binary) {
     /**
      * Get binary
      * @return binary
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_BINARY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -321,7 +321,7 @@ public FormatTest date(LocalDate date) {
     /**
      * Get date
      * @return date
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_DATE)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -345,7 +345,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     /**
      * Get dateTime
      * @return dateTime
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -369,7 +369,7 @@ public FormatTest uuid(UUID uuid) {
     /**
      * Get uuid
      * @return uuid
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -391,7 +391,7 @@ public FormatTest password(String password) {
     /**
      * Get password
      * @return password
-     **/
+     */
     @NotNull
     @Size(min=10, max=64)
     @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -414,7 +414,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     /**
      * Get bigDecimal
      * @return bigDecimal
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index d29cf4a8ce6c..e0b735a53108 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -44,7 +44,7 @@ public HasOnlyReadOnly() {
     /**
      * Get bar
      * @return bar
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_BAR)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -55,7 +55,7 @@ public String getBar() {
     /**
      * Get foo
      * @return foo
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_FOO)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java
index 2bb967332fde..755004e7ca9a 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MapTest.java
@@ -99,7 +99,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     /**
      * Get mapMapOfString
      * @return mapMapOfString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,7 +129,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     /**
      * Get mapOfEnumString
      * @return mapOfEnumString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -159,7 +159,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     /**
      * Get directMap
      * @return directMap
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -189,7 +189,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     /**
      * Get indirectMap
      * @return indirectMap
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 09c9a28aa90a..1af6b913cdfd 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -57,7 +57,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     /**
      * Get uuid
      * @return uuid
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,7 +79,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     /**
      * Get dateTime
      * @return dateTime
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -111,7 +111,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     /**
      * Get map
      * @return map
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java
index 86f83dcd128a..45f32ea12e9a 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Model200Response.java
@@ -49,7 +49,7 @@ public Model200Response name(Integer name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,7 +71,7 @@ public Model200Response propertyClass(String propertyClass) {
     /**
      * Get propertyClass
      * @return propertyClass
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java
index 3407c230d29e..4ee9dbc3b16b 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -53,7 +53,7 @@ public ModelApiResponse code(Integer code) {
     /**
      * Get code
      * @return code
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_CODE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,7 +75,7 @@ public ModelApiResponse type(String type) {
     /**
      * Get type
      * @return type
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_TYPE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,7 +97,7 @@ public ModelApiResponse message(String message) {
     /**
      * Get message
      * @return message
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MESSAGE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java
index ea6ae7264b9e..f9129b2c8214 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelClient.java
@@ -45,7 +45,7 @@ public ModelClient _client(String _client) {
     /**
      * Get _client
      * @return _client
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_CLIENT)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java
index b0f71dca8192..68ccf3af26b9 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelFile.java
@@ -45,7 +45,7 @@ public ModelFile sourceURI(String sourceURI) {
     /**
      * Test capitalization
      * @return sourceURI
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java
index 56c92e55a72d..f010c7c792e8 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelList.java
@@ -45,7 +45,7 @@ public ModelList _123list(String _123list) {
     /**
      * Get _123list
      * @return _123list
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_123LIST)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java
index 457c77dc1637..34ca7218d651 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ModelReturn.java
@@ -45,7 +45,7 @@ public ModelReturn _return(Integer _return) {
     /**
      * Get _return
      * @return _return
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_RETURN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java
index b35ec11071ba..575e85c3a07e 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Name.java
@@ -56,7 +56,7 @@ public Name name(Integer name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -73,7 +73,7 @@ public void setName(Integer name) {
     /**
      * Get snakeCase
      * @return snakeCase
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -89,7 +89,7 @@ public Name property(String property) {
     /**
      * Get property
      * @return property
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PROPERTY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,7 +106,7 @@ public void setProperty(String property) {
     /**
      * Get _123number
      * @return _123number
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_123NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java
index 4d608079dfe4..5b437afe1be6 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/NumberOnly.java
@@ -45,7 +45,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     /**
      * Get justNumber
      * @return justNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java
index 303787881698..23f8772f19a3 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Order.java
@@ -99,7 +99,7 @@ public Order id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,7 +121,7 @@ public Order petId(Long petId) {
     /**
      * Get petId
      * @return petId
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PET_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -143,7 +143,7 @@ public Order quantity(Integer quantity) {
     /**
      * Get quantity
      * @return quantity
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_QUANTITY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -165,7 +165,7 @@ public Order shipDate(OffsetDateTime shipDate) {
     /**
      * Get shipDate
      * @return shipDate
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_SHIP_DATE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -189,7 +189,7 @@ public Order status(StatusEnum status) {
     /**
      * Order Status
      * @return status
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_STATUS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -211,7 +211,7 @@ public Order complete(Boolean complete) {
     /**
      * Get complete
      * @return complete
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_COMPLETE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java
index 62ca07d5366e..f0ada6beabc7 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/OuterComposite.java
@@ -53,7 +53,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     /**
      * Get myNumber
      * @return myNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MY_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,7 +75,7 @@ public OuterComposite myString(String myString) {
     /**
      * Get myString
      * @return myString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MY_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,7 +97,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     /**
      * Get myBoolean
      * @return myBoolean
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java
index 7aae798e2dc8..3108da4940da 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Pet.java
@@ -106,7 +106,7 @@ public Pet id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,7 +128,7 @@ public Pet category(Category category) {
     /**
      * Get category
      * @return category
-     **/
+     */
     @Valid
     @Nullable
     @JsonProperty(JSON_PROPERTY_CATEGORY)
@@ -151,7 +151,7 @@ public Pet name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -178,7 +178,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     /**
      * Get photoUrls
      * @return photoUrls
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -209,7 +209,7 @@ public Pet addTagsItem(Tag tagsItem) {
     /**
      * Get tags
      * @return tags
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_TAGS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -231,7 +231,7 @@ public Pet status(StatusEnum status) {
     /**
      * pet status in the store
      * @return status
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_STATUS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index e42d0babbfba..5fc5aeae5c68 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -43,7 +43,7 @@ public ReadOnlyFirst() {
     /**
      * Get bar
      * @return bar
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_BAR)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -59,7 +59,7 @@ public ReadOnlyFirst baz(String baz) {
     /**
      * Get baz
      * @return baz
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_BAZ)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java
index 21986f1cd3d0..407a9ad78eed 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -45,7 +45,7 @@ public SpecialModelName() {
     /**
      * Get $specialPropertyName
      * @return $specialPropertyName
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java
index 58f5e53c3fc4..685a42110d89 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/Tag.java
@@ -48,7 +48,7 @@ public Tag id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -70,7 +70,7 @@ public Tag name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 8fefd208df17..e21a4065c3be 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -64,7 +64,7 @@ public TypeHolderDefault stringItem(String stringItem) {
     /**
      * Get stringItem
      * @return stringItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_STRING_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,7 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     /**
      * Get numberItem
      * @return numberItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -108,7 +108,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     /**
      * Get integerItem
      * @return integerItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -130,7 +130,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     /**
      * Get boolItem
      * @return boolItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -157,7 +157,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     /**
      * Get arrayItem
      * @return arrayItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java
index 0f13226e58ff..493e3ff2a4c1 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -68,7 +68,7 @@ public TypeHolderExample stringItem(String stringItem) {
     /**
      * Get stringItem
      * @return stringItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_STRING_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -90,7 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     /**
      * Get numberItem
      * @return numberItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -112,7 +112,7 @@ public TypeHolderExample floatItem(Float floatItem) {
     /**
      * Get floatItem
      * @return floatItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -134,7 +134,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
     /**
      * Get integerItem
      * @return integerItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -156,7 +156,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     /**
      * Get boolItem
      * @return boolItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -183,7 +183,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     /**
      * Get arrayItem
      * @return arrayItem
-     **/
+     */
     @NotNull
     @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java
index 0e9b0f0cfaca..d7f89ec57173 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/User.java
@@ -72,7 +72,7 @@ public User id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -94,7 +94,7 @@ public User username(String username) {
     /**
      * Get username
      * @return username
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_USERNAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,7 +116,7 @@ public User firstName(String firstName) {
     /**
      * Get firstName
      * @return firstName
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_FIRST_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,7 +138,7 @@ public User lastName(String lastName) {
     /**
      * Get lastName
      * @return lastName
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_LAST_NAME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -160,7 +160,7 @@ public User email(String email) {
     /**
      * Get email
      * @return email
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_EMAIL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -182,7 +182,7 @@ public User password(String password) {
     /**
      * Get password
      * @return password
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PASSWORD)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -204,7 +204,7 @@ public User phone(String phone) {
     /**
      * Get phone
      * @return phone
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PHONE)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,7 +226,7 @@ public User userStatus(Integer userStatus) {
     /**
      * User Status
      * @return userStatus
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_USER_STATUS)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java
index ea5deabba647..6fbf583df38e 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/XmlItem.java
@@ -160,7 +160,7 @@ public XmlItem attributeString(String attributeString) {
     /**
      * Get attributeString
      * @return attributeString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -182,7 +182,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     /**
      * Get attributeNumber
      * @return attributeNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -204,7 +204,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     /**
      * Get attributeInteger
      * @return attributeInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,7 +226,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     /**
      * Get attributeBoolean
      * @return attributeBoolean
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -256,7 +256,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     /**
      * Get wrappedArray
      * @return wrappedArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -278,7 +278,7 @@ public XmlItem nameString(String nameString) {
     /**
      * Get nameString
      * @return nameString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -300,7 +300,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     /**
      * Get nameNumber
      * @return nameNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -322,7 +322,7 @@ public XmlItem nameInteger(Integer nameInteger) {
     /**
      * Get nameInteger
      * @return nameInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -344,7 +344,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     /**
      * Get nameBoolean
      * @return nameBoolean
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -374,7 +374,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     /**
      * Get nameArray
      * @return nameArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -404,7 +404,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     /**
      * Get nameWrappedArray
      * @return nameWrappedArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -426,7 +426,7 @@ public XmlItem prefixString(String prefixString) {
     /**
      * Get prefixString
      * @return prefixString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -448,7 +448,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     /**
      * Get prefixNumber
      * @return prefixNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -470,7 +470,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     /**
      * Get prefixInteger
      * @return prefixInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -492,7 +492,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     /**
      * Get prefixBoolean
      * @return prefixBoolean
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -522,7 +522,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     /**
      * Get prefixArray
      * @return prefixArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -552,7 +552,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     /**
      * Get prefixWrappedArray
      * @return prefixWrappedArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -574,7 +574,7 @@ public XmlItem namespaceString(String namespaceString) {
     /**
      * Get namespaceString
      * @return namespaceString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -596,7 +596,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     /**
      * Get namespaceNumber
      * @return namespaceNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -618,7 +618,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     /**
      * Get namespaceInteger
      * @return namespaceInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -640,7 +640,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     /**
      * Get namespaceBoolean
      * @return namespaceBoolean
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -670,7 +670,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     /**
      * Get namespaceArray
      * @return namespaceArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -700,7 +700,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     /**
      * Get namespaceWrappedArray
      * @return namespaceWrappedArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -722,7 +722,7 @@ public XmlItem prefixNsString(String prefixNsString) {
     /**
      * Get prefixNsString
      * @return prefixNsString
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -744,7 +744,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     /**
      * Get prefixNsNumber
      * @return prefixNsNumber
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -766,7 +766,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     /**
      * Get prefixNsInteger
      * @return prefixNsInteger
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -788,7 +788,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     /**
      * Get prefixNsBoolean
      * @return prefixNsBoolean
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -818,7 +818,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     /**
      * Get prefixNsArray
      * @return prefixNsArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -848,7 +848,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     /**
      * Get prefixNsWrappedArray
      * @return prefixNsWrappedArray
-     **/
+     */
     @Nullable
     @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
+++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index c85f1b3b05cc..8750275ae850 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -60,10 +60,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -93,10 +93,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 86d13be0efc7..1aa303af57b7 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -51,10 +51,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -76,10 +76,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java
index 1d4dd4860c29..c103dcd0fcca 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Animal.java
@@ -63,10 +63,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -88,10 +88,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 726376f2f6e0..e36913d1116e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -58,10 +58,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index fd1f043da4b0..6ef62703acb5 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -58,10 +58,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java
index a57c39ce1d4f..0e7a94872ba5 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -66,10 +66,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -99,10 +99,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -132,10 +132,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java
index 4c94b1cbd373..e9fbd355a46d 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -66,10 +66,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -91,10 +91,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -141,10 +141,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -191,10 +191,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java
index 871e4cdf2ada..a74d635d5929 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Cat.java
@@ -57,10 +57,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java
index b2b61c3fe9fe..727b5f1bbfc9 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Category.java
@@ -50,10 +50,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 0ff2b17dbd5e..c73a2ebc81f7 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -58,10 +58,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java
index 5473fd8c015f..dfe5d20ed11c 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -46,10 +46,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java
index 2e404010e371..4e4566850fb5 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Client.java
@@ -46,10 +46,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 69a9e8191766..72bf839023cd 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -48,10 +48,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java
index 217156749d72..5e33bf581bd2 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Dog.java
@@ -57,10 +57,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java
index bba733607fcb..8f880c4ebca9 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -123,10 +123,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -156,10 +156,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
index f404168b8563..b7b30166e517 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -227,10 +227,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -252,10 +252,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -277,10 +277,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -302,10 +302,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -327,10 +327,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -360,10 +360,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -385,10 +385,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -410,10 +410,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index 146634cc95e1..812445082a70 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -54,10 +54,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -87,10 +87,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index c799596741a8..8f3d89782c6b 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -54,10 +54,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -87,10 +87,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java
index e9f2a1c56b50..7898d0285d59 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Foo.java
@@ -46,10 +46,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 360d05a40aff..490fb9f7d510 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -48,10 +48,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java
index b69ccce28bfb..4b1180b25d34 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -112,12 +112,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -139,12 +139,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -191,12 +191,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -218,12 +218,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -245,12 +245,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -272,10 +272,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -297,10 +297,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -322,10 +322,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -347,10 +347,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -372,10 +372,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -397,10 +397,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -422,10 +422,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -447,10 +447,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -472,10 +472,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -497,10 +497,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 24d08e310b6a..7848a4dce5dd 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -45,8 +45,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -57,10 +57,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 86dc73496967..b33314efcd1e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -50,10 +50,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java
index c2d63bc87a50..1c5dce9069a8 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MapTest.java
@@ -103,10 +103,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -136,10 +136,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -169,10 +169,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -202,10 +202,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e6d9ae43947e..3c08ceb4be02 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -59,10 +59,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -117,10 +117,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java
index ccad261c780a..12cdd288b002 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -51,10 +51,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -76,10 +76,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 201463719daf..704ad68d90bb 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -55,10 +55,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -80,10 +80,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -105,10 +105,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java
index 8d378cd7452c..e7bb893393f4 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -47,10 +47,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java
index bdc3d85e8729..7d0a9434dcf1 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelList.java
@@ -47,10 +47,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java
index 21753684e8f2..f2a5ec85251a 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -47,10 +47,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java
index 6781bd9d32b4..abcea1d281a8 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Name.java
@@ -52,8 +52,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -70,10 +70,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -89,10 +89,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -109,10 +109,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,10 +128,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 2b73fc36aa56..4e66146e05e2 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
@@ -103,10 +103,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -136,10 +136,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -169,10 +169,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -202,10 +202,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -235,10 +235,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -268,10 +268,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -313,10 +313,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -358,10 +358,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -399,10 +399,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -436,10 +436,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -481,10 +481,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -522,10 +522,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java
index 57294db5f2fe..c1c11051a7d3 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -47,10 +47,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index b37d223d922b..d4d85aa8977e 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -63,10 +63,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,11 +88,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -115,11 +115,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -150,11 +150,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
index fad6dd075d0d..c0cc070bd2ab 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Order.java
@@ -104,10 +104,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -154,10 +154,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -179,10 +179,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -204,10 +204,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -229,10 +229,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java
index eccd712e8a46..9746953fd902 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -55,10 +55,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -80,10 +80,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -105,10 +105,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index 447c89525799..22c5333e3194 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -47,10 +47,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 9bab5d1f2a55..7f7d635932bf 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -99,10 +99,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -124,10 +124,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java
index f75d468bbcf0..b1642f2ede92 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -111,10 +111,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -136,10 +136,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -161,10 +161,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -194,10 +194,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -228,10 +228,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -253,10 +253,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 0ba98790d27e..911572734eb0 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -44,8 +44,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -54,10 +54,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
index c07e3582d07c..c7aa473aac0a 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -47,10 +47,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java
index 1b221c70e3ea..ace6820bcf2c 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,10 +50,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index 0a479d848596..8642015b6145 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -50,10 +50,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java
index f817d286ed05..a309390221f1 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/User.java
@@ -74,10 +74,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -99,10 +99,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -124,10 +124,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -149,10 +149,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -174,10 +174,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -224,10 +224,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -249,10 +249,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 99a123de3fe3..eb03793cf4aa 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -51,10 +51,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 3de530dacd16..82de0573a691 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -52,10 +52,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a69100985da4..6b45308440dc 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -51,10 +51,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index d7218a9d587e..6a164b695422 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -96,10 +96,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -164,10 +164,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -198,10 +198,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -232,10 +232,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -266,10 +266,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -300,10 +300,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -334,10 +334,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -360,10 +360,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -386,10 +386,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -412,10 +412,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE3)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index af5e36ae454f..ef7b6dd7ce4c 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -51,10 +51,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 345fe784509b..bdd5d9c7c1ee 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -52,10 +52,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 2d34a11fc636..eab0a6a02364 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -51,10 +51,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 84aed6c142b0..5cb112013981 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -51,10 +51,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java
index c0c42c4ce58b..1642ec573c24 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Animal.java
@@ -62,10 +62,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -88,10 +88,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index bb68f1da9d89..f9daf760155e 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -56,10 +56,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 29900529eefa..14ceed519ab3 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -56,10 +56,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java
index d23f03ad1909..17ba00fc78c7 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -64,10 +64,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +98,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -132,10 +132,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java
index 9a79b3f2b85f..c084f30832dd 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java
@@ -94,10 +94,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_KIND)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java
index 8aff04a85903..e4f4b17ada39 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -64,10 +64,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -142,10 +142,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -168,10 +168,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -194,10 +194,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java
index 49bb862acba6..95d1c8690513 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Cat.java
@@ -58,10 +58,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java
index 40f856a9781a..559e4c17a290 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Category.java
@@ -48,10 +48,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java
index 70645e87c849..98119bd8e459 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -44,10 +44,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java
index 4c2a4225473d..b70b039e5e19 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Client.java
@@ -44,10 +44,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java
index b4a5c3970ae1..7360281f9a76 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Dog.java
@@ -55,10 +55,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java
index 78902105cc27..d6fbb8a06d3b 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -121,10 +121,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -155,10 +155,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
index 48b8fb4d1772..bb97d6903f66 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -206,10 +206,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -232,10 +232,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -258,10 +258,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -284,10 +284,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -310,10 +310,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java
index ee7925514cf1..182233660b28 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/File.java
@@ -44,10 +44,10 @@ public File sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 1137626a04a3..f3ebdeb279c6 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -52,10 +52,10 @@ public FileSchemaTestClass file(File file) {
     return this;
   }
 
-   /**
+  /**
    * Get file
    * @return file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -86,10 +86,10 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
index 71a0ba7c10a7..5de5044a2259 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -102,12 +102,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,12 +130,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -184,12 +184,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -212,12 +212,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -240,12 +240,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -268,10 +268,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -294,10 +294,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -320,10 +320,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -346,10 +346,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -372,10 +372,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -398,10 +398,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -424,10 +424,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -450,10 +450,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 9106b32613db..35182016a8c4 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -53,10 +53,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java
index 588224f4cfe3..f5b4f9d352a4 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java
@@ -101,10 +101,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -169,10 +169,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -203,10 +203,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7e94d1d99493..ce58da3fd6ce 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -83,10 +83,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -117,10 +117,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java
index fa00361545a8..c73a6374f242 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -49,10 +49,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 9f35e0211bae..d8ae6b86c903 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -53,10 +53,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -105,10 +105,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java
index a8daf6452d1b..c4dcec4f2d71 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java
@@ -45,10 +45,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java
index 9816a81c685f..1f546a37ef69 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -45,10 +45,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java
index 1de93ccd26d4..3bfd4abbefb2 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Name.java
@@ -66,10 +66,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -107,10 +107,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -127,10 +127,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java
index e0fc7d8ae4a2..234c69215e6f 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -45,10 +45,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java
index b55568fb33aa..7249988d5600 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Order.java
@@ -102,10 +102,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,10 +128,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -154,10 +154,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -180,10 +180,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -206,10 +206,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -232,10 +232,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java
index 263372645bf1..78ad4a857ef4 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -53,10 +53,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -105,10 +105,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java
index 4cdc9d39e0da..6ed5d6927a91 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,10 +109,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -161,10 +161,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -195,10 +195,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -230,10 +230,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -256,10 +256,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 7be42717e7a7..607b07056b74 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -50,10 +50,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java
index b9b434812132..002f55a8d4bc 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -45,10 +45,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java
index 41c509367411..8f21b3f2fc74 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/Tag.java
@@ -48,10 +48,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index ff600be2fa83..8836a4549b90 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -64,10 +64,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -90,10 +90,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -116,10 +116,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -142,10 +142,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -176,10 +176,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 3d47342aceb3..f1ad8e12518d 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -68,10 +68,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -94,10 +94,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -120,10 +120,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -146,10 +146,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -172,10 +172,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -206,10 +206,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java
index b8b109926657..f8f61184caaa 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/User.java
@@ -72,10 +72,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +98,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -124,10 +124,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -150,10 +150,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -202,10 +202,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -228,10 +228,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -254,10 +254,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java
index ec346d452bd2..1e56ff0d3781 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -160,10 +160,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -186,10 +186,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -212,10 +212,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -238,10 +238,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -272,10 +272,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -298,10 +298,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -324,10 +324,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -350,10 +350,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -376,10 +376,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -410,10 +410,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -444,10 +444,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -470,10 +470,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -496,10 +496,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -522,10 +522,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -548,10 +548,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -582,10 +582,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -616,10 +616,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -642,10 +642,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -668,10 +668,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -694,10 +694,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -720,10 +720,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -754,10 +754,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -788,10 +788,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -814,10 +814,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -840,10 +840,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -866,10 +866,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -892,10 +892,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -926,10 +926,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -960,10 +960,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/feign/api/openapi.yaml
+++ b/samples/client/petstore/java/feign/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 916dee538fad..6d22ff9f6adc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -91,10 +91,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 0e4c38c99c6a..5ab29c09d1e3 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -48,10 +48,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
index 9fd63226b7e1..9a286b4572d9 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
@@ -60,10 +60,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index aeebdc8187c0..e453caffe2fa 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index ad04bdd9dfac..a731ccddb6f3 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
index 9b54f3ad2b86..024c96810773 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,10 +97,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -131,10 +131,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
index 9dbd6cf2bc46..ece9a4926cda 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -89,10 +89,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -115,10 +115,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -141,10 +141,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -167,10 +167,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -193,10 +193,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
index 82cd89e1c0f7..c66121705023 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
@@ -54,10 +54,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
index e9738d21dd33..6e571e5ba45a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 0c2a63daddfd..3d6f286e49e5 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -55,10 +55,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
index 5e696a0a6af5..27c05f8a8e09 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
index d4f08cf597a1..e73c262a7dcd 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 7935caead8c2..6acd82f7b8ec 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -45,10 +45,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
index 896d053f1fa7..d13b43d813e7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
index acfb23cda71b..63d80fda2ac4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -154,10 +154,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
index 9afbda44673e..9450b7e58f76 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -224,10 +224,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -276,10 +276,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -302,10 +302,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -328,10 +328,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -362,10 +362,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -388,10 +388,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -414,10 +414,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index 0a6d90eda070..bf70a01f4364 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -51,10 +51,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,10 +85,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java
index 8cb45259a761..4a7a48f56b42 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/File.java
@@ -43,10 +43,10 @@ public File sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index ce929bbb1277..8ca06494efc7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass file(File file) {
     return this;
   }
 
-   /**
+  /**
    * Get file
    * @return file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,10 +85,10 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java
index 6d70e38b144f..4767929573c4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Foo.java
@@ -43,10 +43,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 6079e97427ba..058f46f74da8 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -45,10 +45,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
index e5db9bf7440d..f2b72665e68b 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -109,12 +109,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -137,12 +137,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -165,10 +165,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -191,12 +191,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -219,12 +219,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -247,12 +247,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -275,10 +275,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -301,10 +301,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -327,10 +327,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -353,10 +353,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -379,10 +379,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -405,10 +405,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -431,10 +431,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -457,10 +457,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -483,10 +483,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -509,10 +509,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index e67ade26b8e8..36207e2cb9d3 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -52,10 +52,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -67,10 +67,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 2d3d9f2b7dd0..8b8b1167c8bd 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -47,10 +47,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
index 1096afd4258e..3ae6e1f7c90a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -134,10 +134,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -168,10 +168,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -202,10 +202,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index c9f069e457f6..869e4c866a25 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -82,10 +82,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
index 017fae24465a..b74de1f1661f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8ddcf2c7cc57..d029df59562a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -78,10 +78,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java
index 4ccd8fc0f527..1725dca901d5 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
index 77f15f69d895..1ef44e196350 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
index 6e6a3b721800..7d8698d6509e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
@@ -65,10 +65,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -85,10 +85,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 ba8c31a26fa5..cc141eace51f 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
@@ -104,10 +104,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -138,10 +138,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -172,10 +172,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -206,10 +206,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -240,10 +240,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -274,10 +274,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -320,10 +320,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -366,10 +366,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -408,10 +408,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -446,10 +446,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -492,10 +492,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -534,10 +534,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9a0021d97187..71a47395fd29 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 64ea2597cfba..6e92bb28a2fc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -60,10 +60,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -86,11 +86,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -114,11 +114,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -150,11 +150,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index d72e61f37ae5..f678ffc2d448 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -127,10 +127,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -179,10 +179,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -205,10 +205,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -231,10 +231,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
index 457085ee4879..43af4f21660e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -78,10 +78,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index ef030eea5b55..ea650d6170b7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -44,10 +44,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 088bcae658e5..5fbe7648d9cc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -96,10 +96,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -122,10 +122,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
index 6b1528179de5..d820605b43af 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -134,10 +134,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -160,10 +160,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -194,10 +194,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -229,10 +229,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -255,10 +255,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index e671b64bfedc..b7b3bb9183f0 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -49,10 +49,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -70,10 +70,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 933e04514734..9b36cb079004 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
index 73c2c8481a31..1f164d034f3f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index bf0f0dc1c7cb..4b64655bd131 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -51,10 +51,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
index 15c1a3ccc09c..7f4d2c0b1698 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,10 +97,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -123,10 +123,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -149,10 +149,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -175,10 +175,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -227,10 +227,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -253,10 +253,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1b31237f523c..f2a19d779d16 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 715fab6e6e6a..449e5872388a 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -47,10 +47,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 927daf906c7c..29334015b743 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3cef9787b6f3..94c637ae6b0a 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -95,10 +95,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,10 +128,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -161,10 +161,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -194,10 +194,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -227,10 +227,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -260,10 +260,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -326,10 +326,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -351,10 +351,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -376,10 +376,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -401,10 +401,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE3)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 484ed041f341..704e1162e17a 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index e2273e44104a..24e76bef37a6 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -47,10 +47,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c6b3d48fd998..4caced23dd8f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 962b40afefe9..160d00975351 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
index ecb642ee812a..62697dfdebfb 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
@@ -61,10 +61,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 9e972837b116..8feb9e018903 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 761e0f6c9d17..23629d1da5ae 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
index 46a6df1e4e34..e09e6bd4797a 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java
index f539e6ba794d..e425a49e8305 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/BigCat.java
@@ -93,10 +93,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_KIND)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
index 3a82316cd11f..c5d6b86b6c69 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,10 +88,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
index 6a03004859ea..3539a9ef8a53 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
@@ -57,10 +57,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
index e9daed894ab8..7c9d93682b1e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
index faeaf6d170f7..f855164463ba 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
index 4addbe634b17..50cca186dccf 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
index 78b64eaa57db..21bdbf6ac3ac 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
index 0d4340977e8c..01f7885a0fff 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
index 2c8546c4012d..22bb97c598a2 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -205,10 +205,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -230,10 +230,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -255,10 +255,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -280,10 +280,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -305,10 +305,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c75f077d859..b3e7387cf6dc 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
index 6a3ecb852787..a387df2da54c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -101,12 +101,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,12 +128,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -155,10 +155,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -180,12 +180,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -207,12 +207,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -234,12 +234,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -261,10 +261,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -286,10 +286,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -311,10 +311,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -336,10 +336,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -361,10 +361,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -386,10 +386,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -411,10 +411,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -436,10 +436,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4e3d9aa3c7ec..2f46a0e85d02 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
index 6a80971630f8..b0bb9fcb82de 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2cd1a36939b8..b9ab922abe22 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -114,10 +114,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
index 999b5e34446b..2a18245f5f79 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 19b3b2e5b411..1f13412355b8 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java
index 065dbc19bb0b..822fea6c2327 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -44,10 +44,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java
index 432cbfd18ee1..a8fb60cdfc2c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
index 491491e42994..669b30691c79 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
index 1168630509be..3b165e7570c7 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9b8575bb5aa3..8625f00c8741 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
index 198c4705b48d..0fc8d456873f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -151,10 +151,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5bbc97e9f32c..4adb1bc59812 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
index ef0a788e0e09..97d3f950180f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -225,10 +225,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4a4070939629..fa8bdd64bc96 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f3c375404656..a659a8f7aa57 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
index a6b72d921a6a..518116d43ce5 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index a22e61772b50..260b47da9906 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -63,10 +63,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -88,10 +88,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -113,10 +113,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -138,10 +138,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -171,10 +171,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 58917832eeb3..d7ee132c0718 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -67,10 +67,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -92,10 +92,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -117,10 +117,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -142,10 +142,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -167,10 +167,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -200,10 +200,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
index 2c0f53742f0a..2ecb4b0fbb3e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -146,10 +146,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -171,10 +171,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
index 36b3618cb318..91a1c08a1da3 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -159,10 +159,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -184,10 +184,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -209,10 +209,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -234,10 +234,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -267,10 +267,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -292,10 +292,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -317,10 +317,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -342,10 +342,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -367,10 +367,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -400,10 +400,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -433,10 +433,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -458,10 +458,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -483,10 +483,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -508,10 +508,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -533,10 +533,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -566,10 +566,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -599,10 +599,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -624,10 +624,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -649,10 +649,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -674,10 +674,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -699,10 +699,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -732,10 +732,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -765,10 +765,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -790,10 +790,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -815,10 +815,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -840,10 +840,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -865,10 +865,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -898,10 +898,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -931,10 +931,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index ef49af29bc12..d3640344b289 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index e97a99c46224..eedd35f5e7c5 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index d292c3263149..dcd51d78c08a 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 56912808eadd..97b24ce3c997 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
@@ -97,10 +97,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -229,10 +229,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -262,10 +262,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -295,10 +295,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -328,10 +328,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -353,10 +353,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -378,10 +378,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -403,10 +403,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE3)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 70f7f42c2be4..21c64abbafdc 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index de11d7a78553..8c07970a2062 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 320c68deb097..bb165c3323fe 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 0a6ce4de4f02..15a80367606e 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java
index beed1da177de..0bd8dc901391 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Animal.java
@@ -63,10 +63,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -88,10 +88,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 2f990b472a7b..bcfcdeef4003 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
@@ -56,10 +56,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 44f6b97d97c2..4f1942c3bfcd 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
@@ -56,10 +56,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 1457023ecb7e..9c4ea9e26044 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
@@ -64,10 +64,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,10 +97,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java
index f08285ca35c1..fd1ef201d381 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/BigCat.java
@@ -94,10 +94,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_KIND)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Capitalization.java
index 2e76806e9b60..9a86f6bc43b8 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -65,10 +65,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -115,10 +115,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -140,10 +140,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -165,10 +165,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -190,10 +190,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java
index 35e26ae83607..d8a6328cd9ea 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Cat.java
@@ -58,10 +58,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Category.java
index f220788eb81c..30894b69fe24 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Category.java
@@ -49,10 +49,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ClassModel.java
index 9825ca47924c..6b82725db526 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -45,10 +45,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Client.java
index f6f8b1c99210..c1c756e68ee2 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Client.java
@@ -45,10 +45,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java
index c225c1b9fcf9..241a62238922 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Dog.java
@@ -55,10 +55,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 699fca30a939..95ac4e0ca6a0 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
@@ -121,10 +121,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -154,10 +154,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java
index ec99d2681103..cbdfb4af51d0 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -207,10 +207,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -232,10 +232,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -257,10 +257,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -282,10 +282,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -307,10 +307,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 762d3046fe4d..d981b37718fc 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
@@ -52,10 +52,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,10 +85,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java
index 027c524c10c0..621fca3218d0 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -103,12 +103,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,12 +130,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -157,10 +157,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -182,12 +182,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -209,12 +209,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -236,12 +236,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -263,10 +263,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -288,10 +288,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -313,10 +313,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -338,10 +338,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -363,10 +363,10 @@ public FormatTest dateTime(LocalDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -388,10 +388,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -413,10 +413,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -438,10 +438,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index f3e3d132d24b..9a95c807a30a 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -55,10 +55,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -70,10 +70,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 f70f39af2146..28b19756a114 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
@@ -102,10 +102,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -168,10 +168,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 584a8233fdaf..97af8942cf89 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
@@ -58,10 +58,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -83,10 +83,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTi
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Model200Response.java
index eed2db748630..8b238021b97c 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -50,10 +50,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index c273720b1d92..5ebd6eb35302 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -54,10 +54,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelFile.java
index 5a7b12470ca7..d209835cae1b 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -46,10 +46,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelList.java
index 0d311354af59..f6bdbc022ae1 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelList.java
@@ -46,10 +46,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelReturn.java
index b5eed8583372..3a91e2253aeb 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,10 +46,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Name.java
index db16949f0b1b..14576f0c4692 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Name.java
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -87,10 +87,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -107,10 +107,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -127,10 +127,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/NumberOnly.java
index c80c28b00620..ae0e2ca26364 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -46,10 +46,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Order.java
index 98d799ed1cc6..6aac9d638fa5 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Order.java
@@ -103,10 +103,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,10 +128,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -178,10 +178,10 @@ public Order shipDate(LocalDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -203,10 +203,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -228,10 +228,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterComposite.java
index 0b11b06bba0e..d61a23f11039 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -54,10 +54,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 cf40510f7466..5c8e10bd79bf 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
@@ -109,10 +109,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -134,10 +134,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -159,10 +159,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -192,10 +192,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -226,10 +226,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -251,10 +251,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index f243a996f361..6847dfb28bc3 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -52,10 +52,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/SpecialModelName.java
index c7acaa2447aa..f04671f82938 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -46,10 +46,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Tag.java
index 1bc7538c92a2..b05bef74e9d4 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/Tag.java
@@ -49,10 +49,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 6f715c88f619..7d0cacbdd756 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -64,10 +64,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -89,10 +89,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -114,10 +114,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -139,10 +139,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -172,10 +172,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d2a2058e1941..cfce593770df 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -68,10 +68,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -93,10 +93,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -118,10 +118,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -143,10 +143,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -168,10 +168,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -201,10 +201,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/User.java
index 565ffa55ede1..a06ac7e4649e 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/User.java
@@ -73,10 +73,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +98,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -123,10 +123,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -173,10 +173,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -198,10 +198,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -223,10 +223,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -248,10 +248,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 1b4977cbc504..ce76be296c6b 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
@@ -160,10 +160,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -185,10 +185,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -210,10 +210,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -235,10 +235,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -268,10 +268,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -318,10 +318,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -343,10 +343,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -368,10 +368,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -401,10 +401,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -434,10 +434,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -459,10 +459,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -484,10 +484,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -509,10 +509,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -534,10 +534,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -567,10 +567,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -600,10 +600,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -625,10 +625,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -650,10 +650,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -675,10 +675,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -700,10 +700,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -733,10 +733,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -766,10 +766,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -791,10 +791,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -816,10 +816,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -841,10 +841,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -866,10 +866,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -899,10 +899,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -932,10 +932,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index ef49af29bc12..d3640344b289 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index e97a99c46224..eedd35f5e7c5 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index d292c3263149..dcd51d78c08a 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 56912808eadd..97b24ce3c997 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
@@ -97,10 +97,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -229,10 +229,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -262,10 +262,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -295,10 +295,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -328,10 +328,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -353,10 +353,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -378,10 +378,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -403,10 +403,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE3)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 70f7f42c2be4..21c64abbafdc 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index de11d7a78553..8c07970a2062 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 320c68deb097..bb165c3323fe 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 0a6ce4de4f02..15a80367606e 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
index beed1da177de..0bd8dc901391 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
@@ -63,10 +63,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -88,10 +88,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 2f990b472a7b..bcfcdeef4003 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
@@ -56,10 +56,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 44f6b97d97c2..4f1942c3bfcd 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
@@ -56,10 +56,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 1457023ecb7e..9c4ea9e26044 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
@@ -64,10 +64,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,10 +97,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java
index f08285ca35c1..fd1ef201d381 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BigCat.java
@@ -94,10 +94,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_KIND)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
index 2e76806e9b60..9a86f6bc43b8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -65,10 +65,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -115,10 +115,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -140,10 +140,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -165,10 +165,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -190,10 +190,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
index 35e26ae83607..d8a6328cd9ea 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
@@ -58,10 +58,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
index f220788eb81c..30894b69fe24 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
@@ -49,10 +49,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
index 9825ca47924c..6b82725db526 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -45,10 +45,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
index f6f8b1c99210..c1c756e68ee2 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
@@ -45,10 +45,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
index c225c1b9fcf9..241a62238922 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
@@ -55,10 +55,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 699fca30a939..95ac4e0ca6a0 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
@@ -121,10 +121,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -154,10 +154,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index ec99d2681103..cbdfb4af51d0 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -207,10 +207,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -232,10 +232,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -257,10 +257,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -282,10 +282,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -307,10 +307,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 762d3046fe4d..d981b37718fc 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
@@ -52,10 +52,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,10 +85,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index f13d952109d7..4c65e33d67a8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -103,12 +103,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,12 +130,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -157,10 +157,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -182,12 +182,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -209,12 +209,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -236,12 +236,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -263,10 +263,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -288,10 +288,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -313,10 +313,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -338,10 +338,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -363,10 +363,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -388,10 +388,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -413,10 +413,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -438,10 +438,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index f3e3d132d24b..9a95c807a30a 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -55,10 +55,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -70,10 +70,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 f70f39af2146..28b19756a114 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
@@ -102,10 +102,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -168,10 +168,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 5d2d79ab40fc..1bff4fc10813 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
@@ -58,10 +58,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -83,10 +83,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
index eed2db748630..8b238021b97c 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -50,10 +50,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index c273720b1d92..5ebd6eb35302 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -54,10 +54,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java
index 5a7b12470ca7..d209835cae1b 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -46,10 +46,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java
index 0d311354af59..f6bdbc022ae1 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java
@@ -46,10 +46,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
index b5eed8583372..3a91e2253aeb 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,10 +46,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
index db16949f0b1b..14576f0c4692 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -87,10 +87,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -107,10 +107,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -127,10 +127,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
index c80c28b00620..ae0e2ca26364 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -46,10 +46,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
index 0b6b9a4a7104..42b02900b975 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
@@ -103,10 +103,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,10 +128,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -178,10 +178,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -203,10 +203,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -228,10 +228,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
index 0b11b06bba0e..d61a23f11039 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -54,10 +54,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 cf40510f7466..5c8e10bd79bf 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
@@ -109,10 +109,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -134,10 +134,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -159,10 +159,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -192,10 +192,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -226,10 +226,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -251,10 +251,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index f243a996f361..6847dfb28bc3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -52,10 +52,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
index c7acaa2447aa..f04671f82938 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -46,10 +46,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
index 1bc7538c92a2..b05bef74e9d4 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
@@ -49,10 +49,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 6f715c88f619..7d0cacbdd756 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -64,10 +64,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -89,10 +89,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -114,10 +114,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -139,10 +139,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -172,10 +172,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d2a2058e1941..cfce593770df 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -68,10 +68,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -93,10 +93,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -118,10 +118,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -143,10 +143,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -168,10 +168,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -201,10 +201,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
index 565ffa55ede1..a06ac7e4649e 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
@@ -73,10 +73,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +98,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -123,10 +123,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -173,10 +173,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -198,10 +198,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -223,10 +223,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -248,10 +248,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 1b4977cbc504..ce76be296c6b 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
@@ -160,10 +160,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -185,10 +185,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -210,10 +210,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -235,10 +235,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -268,10 +268,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -318,10 +318,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -343,10 +343,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -368,10 +368,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -401,10 +401,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -434,10 +434,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -459,10 +459,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -484,10 +484,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -509,10 +509,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -534,10 +534,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -567,10 +567,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -600,10 +600,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -625,10 +625,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -650,10 +650,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -675,10 +675,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -700,10 +700,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -733,10 +733,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -766,10 +766,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -791,10 +791,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -816,10 +816,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -841,10 +841,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -866,10 +866,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -899,10 +899,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -932,10 +932,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 1a45cc003a4d..3b57da146fdb 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
@@ -89,10 +89,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
@@ -123,10 +123,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -150,10 +150,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -184,10 +184,10 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype1(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype1
    * @return mapWithUndeclaredPropertiesAnytype1
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1)
@@ -210,10 +210,10 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype2(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype2
    * @return mapWithUndeclaredPropertiesAnytype2
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2)
@@ -244,10 +244,10 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesAnytype3Item(Stri
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype3
    * @return mapWithUndeclaredPropertiesAnytype3
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3)
@@ -270,10 +270,10 @@ public AdditionalPropertiesClass emptyMap(Object emptyMap) {
     return this;
   }
 
-   /**
+  /**
    * an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
    * @return emptyMap
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_EMPTY_MAP)
@@ -304,10 +304,10 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesStringItem(String
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesString
    * @return mapWithUndeclaredPropertiesString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java
index 507655e8cf82..14ba9d2f14ae 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Animal.java
@@ -64,10 +64,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -91,10 +91,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_COLOR)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java
index 6b1cacd6019f..20975f2a90b8 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Apple.java
@@ -52,10 +52,10 @@ public Apple cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @jakarta.annotation.Nullable
  @Pattern(regexp="^[a-zA-Z\\s]*$")
   @JsonProperty(JSON_PROPERTY_CULTIVAR)
@@ -78,10 +78,10 @@ public Apple origin(String origin) {
     return this;
   }
 
-   /**
+  /**
    * Get origin
    * @return origin
-  **/
+   */
   @jakarta.annotation.Nullable
  @Pattern(regexp="/^[A-Z\\s]*$/i")
   @JsonProperty(JSON_PROPERTY_ORIGIN)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java
index 4f10c2194c72..01386d179a90 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/AppleReq.java
@@ -52,10 +52,10 @@ public AppleReq cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -79,10 +79,10 @@ public AppleReq mealy(Boolean mealy) {
     return this;
   }
 
-   /**
+  /**
    * Get mealy
    * @return mealy
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MEALY)
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 dd37cc340ade..214525fce5bc 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
@@ -58,10 +58,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
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 ce801fbff36d..c181c4836c05 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
@@ -58,10 +58,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
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 734b43220141..2dc2ed6d0d36 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
@@ -66,10 +66,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
@@ -100,10 +100,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -135,10 +135,10 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java
index a3237a7284ba..74e79622dc7e 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Banana.java
@@ -49,10 +49,10 @@ public Banana lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java
index 6fc67d0dc465..6663005d778f 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BananaReq.java
@@ -53,10 +53,10 @@ public BananaReq lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
   @Valid
@@ -81,10 +81,10 @@ public BananaReq sweet(Boolean sweet) {
     return this;
   }
 
-   /**
+  /**
    * Get sweet
    * @return sweet
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SWEET)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java
index cb3df8443524..cc2b80d7b2e1 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/BasquePig.java
@@ -47,10 +47,10 @@ public BasquePig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java
index b3317a8cde22..7c5caf1687a1 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -67,10 +67,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
@@ -93,10 +93,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
@@ -119,10 +119,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
@@ -145,10 +145,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
@@ -171,10 +171,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
@@ -197,10 +197,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java
index cecdd72a5e08..93ed9e9aa384 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Cat.java
@@ -62,10 +62,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java
index a3c154155b3e..9f6ec34f5114 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Category.java
@@ -51,10 +51,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -77,10 +77,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java
index 1bb3b3a53bb0..22982b3d4971 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ChildCat.java
@@ -67,10 +67,10 @@ public ChildCat name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -101,10 +101,10 @@ public ChildCat petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PET_TYPE)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java
index c08f75240be7..69525fd61702 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -47,10 +47,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java
index b643628f3ff6..dc860771697c 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Client.java
@@ -47,10 +47,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
index a0eacd6c4633..a64640493ec0 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
@@ -55,10 +55,10 @@ public ComplexQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -82,10 +82,10 @@ public ComplexQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java
index 8fab2f3eea8e..aab31208f04d 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DanishPig.java
@@ -47,10 +47,10 @@ public DanishPig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 40b430c0f55b..afdb18415596 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -49,10 +49,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java
index c3d32cd16e2a..84132f685ddc 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Dog.java
@@ -61,10 +61,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BREED)
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 5c5034eb6a44..192a1eec7964 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
@@ -73,10 +73,10 @@ public Drawing mainShape(Shape mainShape) {
     return this;
   }
 
-   /**
+  /**
    * Get mainShape
    * @return mainShape
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -100,10 +100,10 @@ public Drawing shapeOrNull(ShapeOrNull shapeOrNull) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeOrNull
    * @return shapeOrNull
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -135,10 +135,10 @@ public Drawing nullableShape(NullableShape nullableShape) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableShape
    * @return nullableShape
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -178,10 +178,10 @@ public Drawing addShapesItem(Shape shapesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get shapes
    * @return shapes
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
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 20ec4cda9c20..04a6c2a55f8e 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
@@ -123,10 +123,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
@@ -157,10 +157,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
index 9aeffc46edcb..22dcb66fd39e 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -267,10 +267,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
@@ -293,10 +293,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -320,10 +320,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
@@ -346,10 +346,10 @@ public EnumTest enumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
     return this;
   }
 
-   /**
+  /**
    * Get enumIntegerOnly
    * @return enumIntegerOnly
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
@@ -372,10 +372,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
@@ -398,10 +398,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -433,10 +433,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -460,10 +460,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -487,10 +487,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
index beaff76f1f02..be0ebfef63cd 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
@@ -55,10 +55,10 @@ public EquilateralTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -82,10 +82,10 @@ public EquilateralTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
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 68bfbff3f3e9..bf28111482f4 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
@@ -54,10 +54,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -89,10 +89,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java
index 708b7a75ae29..75c5bd8a5cd1 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Foo.java
@@ -47,10 +47,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 6b197d47a888..ae3a071840a5 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -49,10 +49,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java
index ae219d3a9294..e26c0b8f8441 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -113,12 +113,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @jakarta.annotation.Nullable
  @Min(10) @Max(100)
   @JsonProperty(JSON_PROPERTY_INTEGER)
@@ -141,12 +141,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @jakarta.annotation.Nullable
  @Min(20) @Max(200)
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -169,10 +169,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_INT64)
@@ -195,12 +195,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
   @Valid
@@ -225,12 +225,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @jakarta.annotation.Nullable
  @DecimalMin("54.3") @DecimalMax("987.6")
   @JsonProperty(JSON_PROPERTY_FLOAT)
@@ -253,12 +253,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @jakarta.annotation.Nullable
  @DecimalMin("67.8") @DecimalMax("123.4")
   @JsonProperty(JSON_PROPERTY_DOUBLE)
@@ -281,10 +281,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -308,10 +308,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
   @JsonProperty(JSON_PROPERTY_STRING)
@@ -334,10 +334,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -361,10 +361,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -388,10 +388,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
   @Valid
@@ -416,10 +416,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -443,10 +443,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -470,10 +470,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
  @Size(min=10,max=64)
@@ -497,10 +497,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @jakarta.annotation.Nullable
  @Pattern(regexp="^\\d{10}$")
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
@@ -523,10 +523,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @jakarta.annotation.Nullable
  @Pattern(regexp="/^image_\\d{1,3}$/i")
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
index e8b064b2673a..59e866b12dc4 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
@@ -60,10 +60,10 @@ public GrandparentAnimal petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4c9d8bcbcb3f..569e2e19402a 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -57,10 +57,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -73,10 +73,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_FOO)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 8aab605b56bb..3918ef6d1dc9 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -51,10 +51,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
index c82dea4cd74d..546404dab09c 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
@@ -51,10 +51,10 @@ public IsoscelesTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -78,10 +78,10 @@ public IsoscelesTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
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 ea4a5a4a383b..76df9cbe49a1 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
@@ -104,10 +104,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -139,10 +139,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
@@ -173,10 +173,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
@@ -207,10 +207,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
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 724786d95d2a..9cacb816f92c 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
@@ -60,10 +60,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -87,10 +87,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -122,10 +122,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java
index c1b3b9c2730f..59a1b8fd1f61 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -52,10 +52,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -78,10 +78,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 22bfce31e411..3f895adf22a0 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -56,10 +56,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -82,10 +82,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -108,10 +108,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java
index 8e06d510553a..3b1e518a155b 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -48,10 +48,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java
index 2a4a974ed274..c95d14645ba5 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelList.java
@@ -48,10 +48,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_123LIST)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java
index e4767c24b24e..c9ff5dd33ffd 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -48,10 +48,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java
index adfd57f73aa8..7f03e51fddb1 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Name.java
@@ -69,10 +69,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -91,10 +91,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
@@ -112,10 +112,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY)
@@ -133,10 +133,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_123NUMBER)
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 e22643e787ec..82b9e0e852f3 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
@@ -106,10 +106,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -140,10 +140,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -175,10 +175,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -209,10 +209,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -243,10 +243,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -278,10 +278,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -325,10 +325,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -371,10 +371,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -413,10 +413,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
@@ -451,10 +451,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -497,10 +497,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -539,10 +539,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java
index 33876e8c3d85..42d53b2d286e 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -48,10 +48,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
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 4731026fb514..997108d36a6d 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
@@ -66,10 +66,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -93,11 +93,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @Valid
@@ -124,11 +124,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @Valid
@@ -163,11 +163,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java
index 7c6f796493b5..3c5e42248053 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Order.java
@@ -105,10 +105,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -131,10 +131,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -157,10 +157,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -183,10 +183,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -210,10 +210,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -236,10 +236,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java
index 49023519707d..deff727917f3 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -56,10 +56,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -83,10 +83,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MY_STRING)
@@ -109,10 +109,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
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 e88d8702d26c..d113905a2753 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
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -134,10 +134,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -161,10 +161,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -196,10 +196,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -231,10 +231,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -258,10 +258,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_STATUS)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
index 6d71684d9510..6c099ab2f562 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
@@ -47,10 +47,10 @@ public QuadrilateralInterface quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index dedf4c6ceb6b..49a8b447d8c1 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -54,10 +54,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -75,10 +75,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAZ)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
index 343411ef9790..298623a9e14e 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -55,10 +55,10 @@ public ScaleneTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -82,10 +82,10 @@ public ScaleneTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java
index ec9ae196c9a9..cdd9f7919003 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ShapeInterface.java
@@ -47,10 +47,10 @@ public ShapeInterface shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
index bf67bc4ce408..1b3290232c2d 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
@@ -55,10 +55,10 @@ public SimpleQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -82,10 +82,10 @@ public SimpleQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 7f93fe660dca..a64087682745 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -52,10 +52,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
@@ -78,10 +78,10 @@ public SpecialModelName specialModelName(String specialModelName) {
     return this;
   }
 
-   /**
+  /**
    * Get specialModelName
    * @return specialModelName
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SPECIAL_MODEL_NAME)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java
index 14bbab7a1636..aa4361a64e67 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Tag.java
@@ -51,10 +51,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -77,10 +77,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index f11b1b84c683..096407c3cb79 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -52,10 +52,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java
index 3ec2cb72f1c1..52d29f3165b7 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/TriangleInterface.java
@@ -47,10 +47,10 @@ public TriangleInterface triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java
index fb4c0e5cc399..20ceaa472562 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/User.java
@@ -95,10 +95,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -121,10 +121,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -147,10 +147,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -173,10 +173,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -199,10 +199,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -225,10 +225,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -251,10 +251,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -277,10 +277,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
@@ -303,10 +303,10 @@ public User objectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
    * @return objectWithNoDeclaredProps
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS)
@@ -329,10 +329,10 @@ public User objectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNu
     return this;
   }
 
-   /**
+  /**
    * test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
    * @return objectWithNoDeclaredPropsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -363,10 +363,10 @@ public User anyTypeProp(Object anyTypeProp) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
    * @return anyTypeProp
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
@@ -397,10 +397,10 @@ public User anyTypePropNullable(Object anyTypePropNullable) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.
    * @return anyTypePropNullable
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonIgnore
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java
index 67802ff9c5a5..08e4041230ea 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Whale.java
@@ -56,10 +56,10 @@ public Whale hasBaleen(Boolean hasBaleen) {
     return this;
   }
 
-   /**
+  /**
    * Get hasBaleen
    * @return hasBaleen
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_HAS_BALEEN)
@@ -82,10 +82,10 @@ public Whale hasTeeth(Boolean hasTeeth) {
     return this;
   }
 
-   /**
+  /**
    * Get hasTeeth
    * @return hasTeeth
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_HAS_TEETH)
@@ -108,10 +108,10 @@ public Whale className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java
index c8a3f6595caf..7731bdfeb60e 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/Zebra.java
@@ -93,10 +93,10 @@ public Zebra type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -119,10 +119,10 @@ public Zebra className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Category.java
index 1bedcba64e4e..c798b428fe25 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Category.java
@@ -23,34 +23,36 @@
 import jakarta.xml.bind.annotation.*;
 import jakarta.xml.bind.annotation.adapters.*;
 
-@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "Category", propOrder =
-    { "id", "name"
-})
+@XmlType(name = "Category", propOrder =
+    { "id", "name" }
+)
+
 
-@XmlRootElement(name="Category")
+@XmlRootElement(name = "Category")
+@XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Category")
 @JsonPropertyOrder({
   Category.JSON_PROPERTY_ID,
   Category.JSON_PROPERTY_NAME
 })
 /**
   * A category for a pet
- **/
+  */
 
 public class Category  {
   
   public static final String JSON_PROPERTY_ID = "id";
-  @XmlElement(name="id")
+  @XmlElement(name = "id")
   private Long id;
 
   public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name="name")
+  @XmlElement(name = "name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -59,8 +61,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -73,10 +75,10 @@ public Category id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "name")
@@ -85,8 +87,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "name")
@@ -101,8 +103,8 @@ public Category name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ddfadbcf4100..7ea582a1bec1 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -23,12 +23,14 @@
 import jakarta.xml.bind.annotation.*;
 import jakarta.xml.bind.annotation.adapters.*;
 
-@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "ModelApiResponse", propOrder =
-    { "code", "type", "message"
-})
+@XmlType(name = "ModelApiResponse", propOrder =
+    { "code", "type", "message" }
+)
+
 
-@XmlRootElement(name="ModelApiResponse")
+@XmlRootElement(name = "ModelApiResponse")
+@XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "ModelApiResponse")
 @JsonPropertyOrder({
   ModelApiResponse.JSON_PROPERTY_CODE,
   ModelApiResponse.JSON_PROPERTY_TYPE,
@@ -37,26 +39,26 @@
 @JsonTypeName("ApiResponse")
 /**
   * Describes the result of uploading an image resource
- **/
+  */
 
 public class ModelApiResponse  {
   
   public static final String JSON_PROPERTY_CODE = "code";
-  @XmlElement(name="code")
+  @XmlElement(name = "code")
   private Integer code;
 
   public static final String JSON_PROPERTY_TYPE = "type";
-  @XmlElement(name="type")
+  @XmlElement(name = "type")
   private String type;
 
   public static final String JSON_PROPERTY_MESSAGE = "message";
-  @XmlElement(name="message")
+  @XmlElement(name = "message")
   private String message;
 
- /**
+  /**
    * Get code
    * @return code
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "code")
@@ -65,8 +67,8 @@ public Integer getCode() {
   }
 
   /**
-    * Set code
-  **/
+   * Set code
+   */
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "code")
@@ -79,10 +81,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
- /**
+  /**
    * Get type
    * @return type
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "type")
@@ -91,8 +93,8 @@ public String getType() {
   }
 
   /**
-    * Set type
-  **/
+   * Set type
+   */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "type")
@@ -105,10 +107,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
- /**
+  /**
    * Get message
    * @return message
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "message")
@@ -117,8 +119,8 @@ public String getMessage() {
   }
 
   /**
-    * Set message
-  **/
+   * Set message
+   */
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "message")
@@ -133,8 +135,8 @@ public ModelApiResponse message(String message) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Order.java
index b4fd65862e2f..20efbf432c47 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Order.java
@@ -24,12 +24,14 @@
 import jakarta.xml.bind.annotation.*;
 import jakarta.xml.bind.annotation.adapters.*;
 
-@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "Order", propOrder =
-    { "id", "petId", "quantity", "shipDate", "status", "complete"
-})
+@XmlType(name = "Order", propOrder =
+    { "id", "petId", "quantity", "shipDate", "status", "complete" }
+)
+
 
-@XmlRootElement(name="Order")
+@XmlRootElement(name = "Order")
+@XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Order")
 @JsonPropertyOrder({
   Order.JSON_PROPERTY_ID,
   Order.JSON_PROPERTY_PET_ID,
@@ -40,24 +42,24 @@
 })
 /**
   * An order for a pets from the pet store
- **/
+  */
 
 public class Order  {
   
   public static final String JSON_PROPERTY_ID = "id";
-  @XmlElement(name="id")
+  @XmlElement(name = "id")
   private Long id;
 
   public static final String JSON_PROPERTY_PET_ID = "petId";
-  @XmlElement(name="petId")
+  @XmlElement(name = "petId")
   private Long petId;
 
   public static final String JSON_PROPERTY_QUANTITY = "quantity";
-  @XmlElement(name="quantity")
+  @XmlElement(name = "quantity")
   private Integer quantity;
 
   public static final String JSON_PROPERTY_SHIP_DATE = "shipDate";
-  @XmlElement(name="shipDate")
+  @XmlElement(name = "shipDate")
   private Date shipDate;
 
 @XmlType(name="StatusEnum")
@@ -94,20 +96,20 @@ public static StatusEnum fromValue(String v) {
   }
 
   public static final String JSON_PROPERTY_STATUS = "status";
-  @XmlElement(name="status")
+  @XmlElement(name = "status")
  /**
-   * Order Status
-  **/
+  * Order Status
+  */
   private StatusEnum status;
 
   public static final String JSON_PROPERTY_COMPLETE = "complete";
-  @XmlElement(name="complete")
+  @XmlElement(name = "complete")
   private Boolean complete = false;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -116,8 +118,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -130,10 +132,10 @@ public Order id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get petId
    * @return petId
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "petId")
@@ -142,8 +144,8 @@ public Long getPetId() {
   }
 
   /**
-    * Set petId
-  **/
+   * Set petId
+   */
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "petId")
@@ -156,10 +158,10 @@ public Order petId(Long petId) {
     return this;
   }
 
- /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "quantity")
@@ -168,8 +170,8 @@ public Integer getQuantity() {
   }
 
   /**
-    * Set quantity
-  **/
+   * Set quantity
+   */
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "quantity")
@@ -182,10 +184,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
- /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "shipDate")
@@ -194,8 +196,8 @@ public Date getShipDate() {
   }
 
   /**
-    * Set shipDate
-  **/
+   * Set shipDate
+   */
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "shipDate")
@@ -208,10 +210,10 @@ public Order shipDate(Date shipDate) {
     return this;
   }
 
- /**
+  /**
    * Order Status
    * @return status
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "status")
@@ -223,8 +225,8 @@ public String getStatus() {
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "status")
@@ -237,10 +239,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
- /**
+  /**
    * Get complete
    * @return complete
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "complete")
@@ -249,8 +251,8 @@ public Boolean getComplete() {
   }
 
   /**
-    * Set complete
-  **/
+   * Set complete
+   */
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "complete")
@@ -265,8 +267,8 @@ public Order complete(Boolean complete) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Pet.java
index cc6ecbaceecc..d07171344040 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Pet.java
@@ -28,12 +28,14 @@
 import jakarta.xml.bind.annotation.*;
 import jakarta.xml.bind.annotation.adapters.*;
 
-@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "Pet", propOrder =
-    { "id", "category", "name", "photoUrls", "tags", "status"
-})
+@XmlType(name = "Pet", propOrder =
+    { "id", "category", "name", "photoUrls", "tags", "status" }
+)
+
 
-@XmlRootElement(name="Pet")
+@XmlRootElement(name = "Pet")
+@XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Pet")
 @JsonPropertyOrder({
   Pet.JSON_PROPERTY_ID,
   Pet.JSON_PROPERTY_CATEGORY,
@@ -44,28 +46,30 @@
 })
 /**
   * A pet for sale in the pet store
- **/
+  */
 
 public class Pet  {
   
   public static final String JSON_PROPERTY_ID = "id";
-  @XmlElement(name="id")
+  @XmlElement(name = "id")
   private Long id;
 
   public static final String JSON_PROPERTY_CATEGORY = "category";
-  @XmlElement(name="category")
+  @XmlElement(name = "Category")
   private Category category;
 
   public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name="name", required = true)
+  @XmlElement(name = "name")
   private String name;
 
   public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  @XmlElement(name="photoUrls", required = true)
+  @XmlElement(name = "photoUrl")
+  @XmlElementWrapper(name = "photoUrl")
   private List<String> photoUrls = new ArrayList<>();
 
   public static final String JSON_PROPERTY_TAGS = "tags";
-  @XmlElement(name="tags")
+  @XmlElement(name = "Tag")
+  @XmlElementWrapper(name = "tag")
   private List<Tag> tags = null;
 
 @XmlType(name="StatusEnum")
@@ -102,16 +106,16 @@ public static StatusEnum fromValue(String v) {
   }
 
   public static final String JSON_PROPERTY_STATUS = "status";
-  @XmlElement(name="status")
+  @XmlElement(name = "status")
  /**
-   * pet status in the store
-  **/
+  * pet status in the store
+  */
   private StatusEnum status;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -120,8 +124,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -134,10 +138,10 @@ public Pet id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get category
    * @return category
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "Category")
@@ -146,8 +150,8 @@ public Category getCategory() {
   }
 
   /**
-    * Set category
-  **/
+   * Set category
+   */
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "Category")
@@ -160,10 +164,10 @@ public Pet category(Category category) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   @JacksonXmlProperty(localName = "name")
@@ -172,8 +176,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   @JacksonXmlProperty(localName = "name")
@@ -186,27 +190,25 @@ public Pet name(String name) {
     return this;
   }
 
- /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  // xmlName=photoUrl
   @JacksonXmlProperty(localName = "photoUrl")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrl")
+  @JacksonXmlElementWrapper(localName = "photoUrl", useWrapping = true)
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
   /**
-    * Set photoUrls
-  **/
+   * Set photoUrls
+   */
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  // xmlName=photoUrl
   @JacksonXmlProperty(localName = "photoUrl")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrl")
+  @JacksonXmlElementWrapper(localName = "photoUrl", useWrapping = true)
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
@@ -224,27 +226,25 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
- /**
+  /**
    * Get tags
    * @return tags
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  // xmlName=tag
-  @JacksonXmlProperty(localName = "tag")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "tag")
+  @JacksonXmlProperty(localName = "Tag")
+  @JacksonXmlElementWrapper(localName = "tag", useWrapping = true)
   public List<Tag> getTags() {
     return tags;
   }
 
   /**
-    * Set tags
-  **/
+   * Set tags
+   */
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  // xmlName=tag
-  @JacksonXmlProperty(localName = "tag")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "tag")
+  @JacksonXmlProperty(localName = "Tag")
+  @JacksonXmlElementWrapper(localName = "tag", useWrapping = true)
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
@@ -262,11 +262,11 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
- /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   **/
   @Deprecated
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -279,8 +279,8 @@ public String getStatus() {
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "status")
@@ -295,8 +295,8 @@ public Pet status(StatusEnum status) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Tag.java
index 488983ce94f3..db5a74ca2be2 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/Tag.java
@@ -23,34 +23,36 @@
 import jakarta.xml.bind.annotation.*;
 import jakarta.xml.bind.annotation.adapters.*;
 
-@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "Tag", propOrder =
-    { "id", "name"
-})
+@XmlType(name = "Tag", propOrder =
+    { "id", "name" }
+)
+
 
-@XmlRootElement(name="Tag")
+@XmlRootElement(name = "Tag")
+@XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "Tag")
 @JsonPropertyOrder({
   Tag.JSON_PROPERTY_ID,
   Tag.JSON_PROPERTY_NAME
 })
 /**
   * A tag for a pet
- **/
+  */
 
 public class Tag  {
   
   public static final String JSON_PROPERTY_ID = "id";
-  @XmlElement(name="id")
+  @XmlElement(name = "id")
   private Long id;
 
   public static final String JSON_PROPERTY_NAME = "name";
-  @XmlElement(name="name")
+  @XmlElement(name = "name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -59,8 +61,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -73,10 +75,10 @@ public Tag id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "name")
@@ -85,8 +87,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "name")
@@ -101,8 +103,8 @@ public Tag name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/User.java
index 2e70b010de39..9856bbcead54 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson-with-xml/src/main/java/org/openapitools/client/model/User.java
@@ -23,12 +23,14 @@
 import jakarta.xml.bind.annotation.*;
 import jakarta.xml.bind.annotation.adapters.*;
 
-@XmlAccessorType(XmlAccessType.FIELD)
- @XmlType(name = "User", propOrder =
-    { "id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus"
-})
+@XmlType(name = "User", propOrder =
+    { "id", "username", "firstName", "lastName", "email", "password", "phone", "userStatus" }
+)
 
-@XmlRootElement(name="User")
+
+@XmlRootElement(name = "User")
+@XmlAccessorType(XmlAccessType.FIELD)
+@JacksonXmlRootElement(localName = "User")
 @JsonPropertyOrder({
   User.JSON_PROPERTY_ID,
   User.JSON_PROPERTY_USERNAME,
@@ -41,49 +43,49 @@
 })
 /**
   * A User who is purchasing from the pet store
- **/
+  */
 
 public class User  {
   
   public static final String JSON_PROPERTY_ID = "id";
-  @XmlElement(name="id")
+  @XmlElement(name = "id")
   private Long id;
 
   public static final String JSON_PROPERTY_USERNAME = "username";
-  @XmlElement(name="username")
+  @XmlElement(name = "username")
   private String username;
 
   public static final String JSON_PROPERTY_FIRST_NAME = "firstName";
-  @XmlElement(name="firstName")
+  @XmlElement(name = "firstName")
   private String firstName;
 
   public static final String JSON_PROPERTY_LAST_NAME = "lastName";
-  @XmlElement(name="lastName")
+  @XmlElement(name = "lastName")
   private String lastName;
 
   public static final String JSON_PROPERTY_EMAIL = "email";
-  @XmlElement(name="email")
+  @XmlElement(name = "email")
   private String email;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
-  @XmlElement(name="password")
+  @XmlElement(name = "password")
   private String password;
 
   public static final String JSON_PROPERTY_PHONE = "phone";
-  @XmlElement(name="phone")
+  @XmlElement(name = "phone")
   private String phone;
 
   public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
-  @XmlElement(name="userStatus")
+  @XmlElement(name = "userStatus")
  /**
-   * User Status
-  **/
+  * User Status
+  */
   private Integer userStatus;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -92,8 +94,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "id")
@@ -106,10 +108,10 @@ public User id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get username
    * @return username
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "username")
@@ -118,8 +120,8 @@ public String getUsername() {
   }
 
   /**
-    * Set username
-  **/
+   * Set username
+   */
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "username")
@@ -132,10 +134,10 @@ public User username(String username) {
     return this;
   }
 
- /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "firstName")
@@ -144,8 +146,8 @@ public String getFirstName() {
   }
 
   /**
-    * Set firstName
-  **/
+   * Set firstName
+   */
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "firstName")
@@ -158,10 +160,10 @@ public User firstName(String firstName) {
     return this;
   }
 
- /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "lastName")
@@ -170,8 +172,8 @@ public String getLastName() {
   }
 
   /**
-    * Set lastName
-  **/
+   * Set lastName
+   */
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "lastName")
@@ -184,10 +186,10 @@ public User lastName(String lastName) {
     return this;
   }
 
- /**
+  /**
    * Get email
    * @return email
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "email")
@@ -196,8 +198,8 @@ public String getEmail() {
   }
 
   /**
-    * Set email
-  **/
+   * Set email
+   */
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "email")
@@ -210,10 +212,10 @@ public User email(String email) {
     return this;
   }
 
- /**
+  /**
    * Get password
    * @return password
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "password")
@@ -222,8 +224,8 @@ public String getPassword() {
   }
 
   /**
-    * Set password
-  **/
+   * Set password
+   */
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "password")
@@ -236,10 +238,10 @@ public User password(String password) {
     return this;
   }
 
- /**
+  /**
    * Get phone
    * @return phone
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "phone")
@@ -248,8 +250,8 @@ public String getPhone() {
   }
 
   /**
-    * Set phone
-  **/
+   * Set phone
+   */
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "phone")
@@ -262,10 +264,10 @@ public User phone(String phone) {
     return this;
   }
 
- /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "userStatus")
@@ -274,8 +276,8 @@ public Integer getUserStatus() {
   }
 
   /**
-    * Set userStatus
-  **/
+   * Set userStatus
+   */
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "userStatus")
@@ -290,8 +292,8 @@ public User userStatus(Integer userStatus) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Category.java
index f90df1d1bf3e..e08314ab6827 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Category.java
@@ -26,7 +26,7 @@
 })
 /**
   * A category for a pet
- **/
+  */
 
 public class Category  {
   
@@ -38,10 +38,10 @@ public class Category  {
   
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -49,8 +49,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -62,10 +62,10 @@ public Category id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getName() {
@@ -73,8 +73,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
@@ -88,8 +88,8 @@ public Category name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index d66986b54787..75df05dfaeff 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -28,7 +28,7 @@
 @JsonTypeName("ApiResponse")
 /**
   * Describes the result of uploading an image resource
- **/
+  */
 
 public class ModelApiResponse  {
   
@@ -44,10 +44,10 @@ public class ModelApiResponse  {
   
   private String message;
 
- /**
+  /**
    * Get code
    * @return code
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getCode() {
@@ -55,8 +55,8 @@ public Integer getCode() {
   }
 
   /**
-    * Set code
-  **/
+   * Set code
+   */
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCode(Integer code) {
@@ -68,10 +68,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
- /**
+  /**
    * Get type
    * @return type
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getType() {
@@ -79,8 +79,8 @@ public String getType() {
   }
 
   /**
-    * Set type
-  **/
+   * Set type
+   */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setType(String type) {
@@ -92,10 +92,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
- /**
+  /**
    * Get message
    * @return message
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getMessage() {
@@ -103,8 +103,8 @@ public String getMessage() {
   }
 
   /**
-    * Set message
-  **/
+   * Set message
+   */
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setMessage(String message) {
@@ -118,8 +118,8 @@ public ModelApiResponse message(String message) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
index b6c0aec0c23d..eb683221585e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Order.java
@@ -31,7 +31,7 @@
 })
 /**
   * An order for a pets from the pet store
- **/
+  */
 
 public class Order  {
   
@@ -85,8 +85,8 @@ public static StatusEnum fromValue(String value) {
 
   public static final String JSON_PROPERTY_STATUS = "status";
  /**
-   * Order Status
-  **/
+  * Order Status
+  */
   
   private StatusEnum status;
 
@@ -94,10 +94,10 @@ public static StatusEnum fromValue(String value) {
   
   private Boolean complete = false;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -105,8 +105,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -118,10 +118,10 @@ public Order id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get petId
    * @return petId
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getPetId() {
@@ -129,8 +129,8 @@ public Long getPetId() {
   }
 
   /**
-    * Set petId
-  **/
+   * Set petId
+   */
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPetId(Long petId) {
@@ -142,10 +142,10 @@ public Order petId(Long petId) {
     return this;
   }
 
- /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getQuantity() {
@@ -153,8 +153,8 @@ public Integer getQuantity() {
   }
 
   /**
-    * Set quantity
-  **/
+   * Set quantity
+   */
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setQuantity(Integer quantity) {
@@ -166,10 +166,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
- /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Date getShipDate() {
@@ -177,8 +177,8 @@ public Date getShipDate() {
   }
 
   /**
-    * Set shipDate
-  **/
+   * Set shipDate
+   */
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setShipDate(Date shipDate) {
@@ -190,10 +190,10 @@ public Order shipDate(Date shipDate) {
     return this;
   }
 
- /**
+  /**
    * Order Status
    * @return status
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public StatusEnum getStatus() {
@@ -201,8 +201,8 @@ public StatusEnum getStatus() {
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStatus(StatusEnum status) {
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
- /**
+  /**
    * Get complete
    * @return complete
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Boolean getComplete() {
@@ -225,8 +225,8 @@ public Boolean getComplete() {
   }
 
   /**
-    * Set complete
-  **/
+   * Set complete
+   */
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setComplete(Boolean complete) {
@@ -240,8 +240,8 @@ public Order complete(Boolean complete) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
index defd4504bc76..0e0720b77141 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Pet.java
@@ -35,7 +35,7 @@
 })
 /**
   * A pet for sale in the pet store
- **/
+  */
 
 public class Pet  {
   
@@ -93,15 +93,15 @@ public static StatusEnum fromValue(String value) {
 
   public static final String JSON_PROPERTY_STATUS = "status";
  /**
-   * pet status in the store
-  **/
+  * pet status in the store
+  */
   
   private StatusEnum status;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -109,8 +109,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -122,10 +122,10 @@ public Pet id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get category
    * @return category
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Category getCategory() {
@@ -133,8 +133,8 @@ public Category getCategory() {
   }
 
   /**
-    * Set category
-  **/
+   * Set category
+   */
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCategory(Category category) {
@@ -146,10 +146,10 @@ public Pet category(Category category) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public String getName() {
@@ -157,8 +157,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setName(String name) {
@@ -170,10 +170,10 @@ public Pet name(String name) {
     return this;
   }
 
- /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public List<String> getPhotoUrls() {
@@ -181,8 +181,8 @@ public List<String> getPhotoUrls() {
   }
 
   /**
-    * Set photoUrls
-  **/
+   * Set photoUrls
+   */
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setPhotoUrls(List<String> photoUrls) {
@@ -202,10 +202,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
- /**
+  /**
    * Get tags
    * @return tags
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public List<Tag> getTags() {
@@ -213,8 +213,8 @@ public List<Tag> getTags() {
   }
 
   /**
-    * Set tags
-  **/
+   * Set tags
+   */
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setTags(List<Tag> tags) {
@@ -234,11 +234,11 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
- /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   **/
   @Deprecated
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -247,8 +247,8 @@ public StatusEnum getStatus() {
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStatus(StatusEnum status) {
@@ -262,8 +262,8 @@ public Pet status(StatusEnum status) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Tag.java
index 283def00e3e8..b6f693497852 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/Tag.java
@@ -26,7 +26,7 @@
 })
 /**
   * A tag for a pet
- **/
+  */
 
 public class Tag  {
   
@@ -38,10 +38,10 @@ public class Tag  {
   
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -49,8 +49,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -62,10 +62,10 @@ public Tag id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getName() {
@@ -73,8 +73,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
@@ -88,8 +88,8 @@ public Tag name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/User.java
index 26490077dd3e..fda9ee53d143 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0-jackson/src/main/java/org/openapitools/client/model/User.java
@@ -32,7 +32,7 @@
 })
 /**
   * A User who is purchasing from the pet store
- **/
+  */
 
 public class User  {
   
@@ -66,15 +66,15 @@ public class User  {
 
   public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
  /**
-   * User Status
-  **/
+  * User Status
+  */
   
   private Integer userStatus;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -82,8 +82,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -95,10 +95,10 @@ public User id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get username
    * @return username
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getUsername() {
@@ -106,8 +106,8 @@ public String getUsername() {
   }
 
   /**
-    * Set username
-  **/
+   * Set username
+   */
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setUsername(String username) {
@@ -119,10 +119,10 @@ public User username(String username) {
     return this;
   }
 
- /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getFirstName() {
@@ -130,8 +130,8 @@ public String getFirstName() {
   }
 
   /**
-    * Set firstName
-  **/
+   * Set firstName
+   */
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setFirstName(String firstName) {
@@ -143,10 +143,10 @@ public User firstName(String firstName) {
     return this;
   }
 
- /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getLastName() {
@@ -154,8 +154,8 @@ public String getLastName() {
   }
 
   /**
-    * Set lastName
-  **/
+   * Set lastName
+   */
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setLastName(String lastName) {
@@ -167,10 +167,10 @@ public User lastName(String lastName) {
     return this;
   }
 
- /**
+  /**
    * Get email
    * @return email
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getEmail() {
@@ -178,8 +178,8 @@ public String getEmail() {
   }
 
   /**
-    * Set email
-  **/
+   * Set email
+   */
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setEmail(String email) {
@@ -191,10 +191,10 @@ public User email(String email) {
     return this;
   }
 
- /**
+  /**
    * Get password
    * @return password
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getPassword() {
@@ -202,8 +202,8 @@ public String getPassword() {
   }
 
   /**
-    * Set password
-  **/
+   * Set password
+   */
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPassword(String password) {
@@ -215,10 +215,10 @@ public User password(String password) {
     return this;
   }
 
- /**
+  /**
    * Get phone
    * @return phone
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getPhone() {
@@ -226,8 +226,8 @@ public String getPhone() {
   }
 
   /**
-    * Set phone
-  **/
+   * Set phone
+   */
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPhone(String phone) {
@@ -239,10 +239,10 @@ public User phone(String phone) {
     return this;
   }
 
- /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getUserStatus() {
@@ -250,8 +250,8 @@ public Integer getUserStatus() {
   }
 
   /**
-    * Set userStatus
-  **/
+   * Set userStatus
+   */
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setUserStatus(Integer userStatus) {
@@ -265,8 +265,8 @@ public User userStatus(Integer userStatus) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Category.java
index aa7007ad5d56..121589eaeb6a 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Category.java
@@ -25,7 +25,7 @@
 
 /**
   * A category for a pet
- **/
+  */
 
 public class Category  {
   
@@ -35,17 +35,17 @@ public class Category  {
   @JsonbProperty("name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -55,17 +55,17 @@ public Category id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -77,8 +77,8 @@ public Category name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 44eea59b3eeb..c1df0dd408ae 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -25,7 +25,7 @@
 
 /**
   * Describes the result of uploading an image resource
- **/
+  */
 
 public class ModelApiResponse  {
   
@@ -38,17 +38,17 @@ public class ModelApiResponse  {
   @JsonbProperty("message")
   private String message;
 
- /**
+  /**
    * Get code
    * @return code
-  **/
+   **/
   public Integer getCode() {
     return code;
   }
 
   /**
-    * Set code
-  **/
+   * Set code
+   */
   public void setCode(Integer code) {
     this.code = code;
   }
@@ -58,17 +58,17 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
- /**
+  /**
    * Get type
    * @return type
-  **/
+   **/
   public String getType() {
     return type;
   }
 
   /**
-    * Set type
-  **/
+   * Set type
+   */
   public void setType(String type) {
     this.type = type;
   }
@@ -78,17 +78,17 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
- /**
+  /**
    * Get message
    * @return message
-  **/
+   **/
   public String getMessage() {
     return message;
   }
 
   /**
-    * Set message
-  **/
+   * Set message
+   */
   public void setMessage(String message) {
     this.message = message;
   }
@@ -100,8 +100,8 @@ public ModelApiResponse message(String message) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
index d378038fc30f..489c7fc73c5f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Order.java
@@ -26,7 +26,7 @@
 
 /**
   * An order for a pets from the pet store
- **/
+  */
 
 public class Order  {
   
@@ -85,25 +85,25 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   }
 
  /**
-   * Order Status
-  **/
+  * Order Status
+  */
   @JsonbProperty("status")
   private StatusEnum status;
 
   @JsonbProperty("complete")
   private Boolean complete = false;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -113,17 +113,17 @@ public Order id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get petId
    * @return petId
-  **/
+   **/
   public Long getPetId() {
     return petId;
   }
 
   /**
-    * Set petId
-  **/
+   * Set petId
+   */
   public void setPetId(Long petId) {
     this.petId = petId;
   }
@@ -133,17 +133,17 @@ public Order petId(Long petId) {
     return this;
   }
 
- /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   **/
   public Integer getQuantity() {
     return quantity;
   }
 
   /**
-    * Set quantity
-  **/
+   * Set quantity
+   */
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
@@ -153,17 +153,17 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
- /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   **/
   public Date getShipDate() {
     return shipDate;
   }
 
   /**
-    * Set shipDate
-  **/
+   * Set shipDate
+   */
   public void setShipDate(Date shipDate) {
     this.shipDate = shipDate;
   }
@@ -173,17 +173,17 @@ public Order shipDate(Date shipDate) {
     return this;
   }
 
- /**
+  /**
    * Order Status
    * @return status
-  **/
+   **/
   public StatusEnum getStatus() {
     return status;
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
@@ -193,17 +193,17 @@ public Order status(StatusEnum status) {
     return this;
   }
 
- /**
+  /**
    * Get complete
    * @return complete
-  **/
+   **/
   public Boolean getComplete() {
     return complete;
   }
 
   /**
-    * Set complete
-  **/
+   * Set complete
+   */
   public void setComplete(Boolean complete) {
     this.complete = complete;
   }
@@ -215,8 +215,8 @@ public Order complete(Boolean complete) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
index 822179523dc9..5761ee105f1e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Pet.java
@@ -30,7 +30,7 @@
 
 /**
   * A pet for sale in the pet store
- **/
+  */
 
 public class Pet  {
   
@@ -92,22 +92,22 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   }
 
  /**
-   * pet status in the store
-  **/
+  * pet status in the store
+  */
   @JsonbProperty("status")
   private StatusEnum status;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -117,17 +117,17 @@ public Pet id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get category
    * @return category
-  **/
+   **/
   public Category getCategory() {
     return category;
   }
 
   /**
-    * Set category
-  **/
+   * Set category
+   */
   public void setCategory(Category category) {
     this.category = category;
   }
@@ -137,17 +137,17 @@ public Pet category(Category category) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -157,17 +157,17 @@ public Pet name(String name) {
     return this;
   }
 
- /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   **/
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
   /**
-    * Set photoUrls
-  **/
+   * Set photoUrls
+   */
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
@@ -185,17 +185,17 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
- /**
+  /**
    * Get tags
    * @return tags
-  **/
+   **/
   public List<Tag> getTags() {
     return tags;
   }
 
   /**
-    * Set tags
-  **/
+   * Set tags
+   */
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
@@ -213,19 +213,19 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
- /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   **/
   @Deprecated
   public StatusEnum getStatus() {
     return status;
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
@@ -237,8 +237,8 @@ public Pet status(StatusEnum status) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Tag.java
index fecc6943bff3..28985a1f069b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/Tag.java
@@ -25,7 +25,7 @@
 
 /**
   * A tag for a pet
- **/
+  */
 
 public class Tag  {
   
@@ -35,17 +35,17 @@ public class Tag  {
   @JsonbProperty("name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -55,17 +55,17 @@ public Tag id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -77,8 +77,8 @@ public Tag name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/User.java
index e4f99ba38d39..d9ebaeb284dd 100644
--- a/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/microprofile-rest-client-3.0/src/main/java/org/openapitools/client/model/User.java
@@ -25,7 +25,7 @@
 
 /**
   * A User who is purchasing from the pet store
- **/
+  */
 
 public class User  {
   
@@ -51,22 +51,22 @@ public class User  {
   private String phone;
 
  /**
-   * User Status
-  **/
+  * User Status
+  */
   @JsonbProperty("userStatus")
   private Integer userStatus;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -76,17 +76,17 @@ public User id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get username
    * @return username
-  **/
+   **/
   public String getUsername() {
     return username;
   }
 
   /**
-    * Set username
-  **/
+   * Set username
+   */
   public void setUsername(String username) {
     this.username = username;
   }
@@ -96,17 +96,17 @@ public User username(String username) {
     return this;
   }
 
- /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   **/
   public String getFirstName() {
     return firstName;
   }
 
   /**
-    * Set firstName
-  **/
+   * Set firstName
+   */
   public void setFirstName(String firstName) {
     this.firstName = firstName;
   }
@@ -116,17 +116,17 @@ public User firstName(String firstName) {
     return this;
   }
 
- /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   **/
   public String getLastName() {
     return lastName;
   }
 
   /**
-    * Set lastName
-  **/
+   * Set lastName
+   */
   public void setLastName(String lastName) {
     this.lastName = lastName;
   }
@@ -136,17 +136,17 @@ public User lastName(String lastName) {
     return this;
   }
 
- /**
+  /**
    * Get email
    * @return email
-  **/
+   **/
   public String getEmail() {
     return email;
   }
 
   /**
-    * Set email
-  **/
+   * Set email
+   */
   public void setEmail(String email) {
     this.email = email;
   }
@@ -156,17 +156,17 @@ public User email(String email) {
     return this;
   }
 
- /**
+  /**
    * Get password
    * @return password
-  **/
+   **/
   public String getPassword() {
     return password;
   }
 
   /**
-    * Set password
-  **/
+   * Set password
+   */
   public void setPassword(String password) {
     this.password = password;
   }
@@ -176,17 +176,17 @@ public User password(String password) {
     return this;
   }
 
- /**
+  /**
    * Get phone
    * @return phone
-  **/
+   **/
   public String getPhone() {
     return phone;
   }
 
   /**
-    * Set phone
-  **/
+   * Set phone
+   */
   public void setPhone(String phone) {
     this.phone = phone;
   }
@@ -196,17 +196,17 @@ public User phone(String phone) {
     return this;
   }
 
- /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   **/
   public Integer getUserStatus() {
     return userStatus;
   }
 
   /**
-    * Set userStatus
-  **/
+   * Set userStatus
+   */
   public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }
@@ -218,8 +218,8 @@ public User userStatus(Integer userStatus) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Category.java
index aa7007ad5d56..121589eaeb6a 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Category.java
@@ -25,7 +25,7 @@
 
 /**
   * A category for a pet
- **/
+  */
 
 public class Category  {
   
@@ -35,17 +35,17 @@ public class Category  {
   @JsonbProperty("name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -55,17 +55,17 @@ public Category id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -77,8 +77,8 @@ public Category name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 44eea59b3eeb..c1df0dd408ae 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -25,7 +25,7 @@
 
 /**
   * Describes the result of uploading an image resource
- **/
+  */
 
 public class ModelApiResponse  {
   
@@ -38,17 +38,17 @@ public class ModelApiResponse  {
   @JsonbProperty("message")
   private String message;
 
- /**
+  /**
    * Get code
    * @return code
-  **/
+   **/
   public Integer getCode() {
     return code;
   }
 
   /**
-    * Set code
-  **/
+   * Set code
+   */
   public void setCode(Integer code) {
     this.code = code;
   }
@@ -58,17 +58,17 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
- /**
+  /**
    * Get type
    * @return type
-  **/
+   **/
   public String getType() {
     return type;
   }
 
   /**
-    * Set type
-  **/
+   * Set type
+   */
   public void setType(String type) {
     this.type = type;
   }
@@ -78,17 +78,17 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
- /**
+  /**
    * Get message
    * @return message
-  **/
+   **/
   public String getMessage() {
     return message;
   }
 
   /**
-    * Set message
-  **/
+   * Set message
+   */
   public void setMessage(String message) {
     this.message = message;
   }
@@ -100,8 +100,8 @@ public ModelApiResponse message(String message) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
index d378038fc30f..489c7fc73c5f 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Order.java
@@ -26,7 +26,7 @@
 
 /**
   * An order for a pets from the pet store
- **/
+  */
 
 public class Order  {
   
@@ -85,25 +85,25 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   }
 
  /**
-   * Order Status
-  **/
+  * Order Status
+  */
   @JsonbProperty("status")
   private StatusEnum status;
 
   @JsonbProperty("complete")
   private Boolean complete = false;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -113,17 +113,17 @@ public Order id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get petId
    * @return petId
-  **/
+   **/
   public Long getPetId() {
     return petId;
   }
 
   /**
-    * Set petId
-  **/
+   * Set petId
+   */
   public void setPetId(Long petId) {
     this.petId = petId;
   }
@@ -133,17 +133,17 @@ public Order petId(Long petId) {
     return this;
   }
 
- /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   **/
   public Integer getQuantity() {
     return quantity;
   }
 
   /**
-    * Set quantity
-  **/
+   * Set quantity
+   */
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
@@ -153,17 +153,17 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
- /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   **/
   public Date getShipDate() {
     return shipDate;
   }
 
   /**
-    * Set shipDate
-  **/
+   * Set shipDate
+   */
   public void setShipDate(Date shipDate) {
     this.shipDate = shipDate;
   }
@@ -173,17 +173,17 @@ public Order shipDate(Date shipDate) {
     return this;
   }
 
- /**
+  /**
    * Order Status
    * @return status
-  **/
+   **/
   public StatusEnum getStatus() {
     return status;
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
@@ -193,17 +193,17 @@ public Order status(StatusEnum status) {
     return this;
   }
 
- /**
+  /**
    * Get complete
    * @return complete
-  **/
+   **/
   public Boolean getComplete() {
     return complete;
   }
 
   /**
-    * Set complete
-  **/
+   * Set complete
+   */
   public void setComplete(Boolean complete) {
     this.complete = complete;
   }
@@ -215,8 +215,8 @@ public Order complete(Boolean complete) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
index 822179523dc9..5761ee105f1e 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Pet.java
@@ -30,7 +30,7 @@
 
 /**
   * A pet for sale in the pet store
- **/
+  */
 
 public class Pet  {
   
@@ -92,22 +92,22 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   }
 
  /**
-   * pet status in the store
-  **/
+  * pet status in the store
+  */
   @JsonbProperty("status")
   private StatusEnum status;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -117,17 +117,17 @@ public Pet id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get category
    * @return category
-  **/
+   **/
   public Category getCategory() {
     return category;
   }
 
   /**
-    * Set category
-  **/
+   * Set category
+   */
   public void setCategory(Category category) {
     this.category = category;
   }
@@ -137,17 +137,17 @@ public Pet category(Category category) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -157,17 +157,17 @@ public Pet name(String name) {
     return this;
   }
 
- /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   **/
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
   /**
-    * Set photoUrls
-  **/
+   * Set photoUrls
+   */
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
@@ -185,17 +185,17 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
- /**
+  /**
    * Get tags
    * @return tags
-  **/
+   **/
   public List<Tag> getTags() {
     return tags;
   }
 
   /**
-    * Set tags
-  **/
+   * Set tags
+   */
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
@@ -213,19 +213,19 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
- /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   **/
   @Deprecated
   public StatusEnum getStatus() {
     return status;
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
@@ -237,8 +237,8 @@ public Pet status(StatusEnum status) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Tag.java
index fecc6943bff3..28985a1f069b 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/Tag.java
@@ -25,7 +25,7 @@
 
 /**
   * A tag for a pet
- **/
+  */
 
 public class Tag  {
   
@@ -35,17 +35,17 @@ public class Tag  {
   @JsonbProperty("name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -55,17 +55,17 @@ public Tag id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -77,8 +77,8 @@ public Tag name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/User.java
index e4f99ba38d39..d9ebaeb284dd 100644
--- a/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/microprofile-rest-client-with-useSingleRequestParameter/src/main/java/org/openapitools/client/model/User.java
@@ -25,7 +25,7 @@
 
 /**
   * A User who is purchasing from the pet store
- **/
+  */
 
 public class User  {
   
@@ -51,22 +51,22 @@ public class User  {
   private String phone;
 
  /**
-   * User Status
-  **/
+  * User Status
+  */
   @JsonbProperty("userStatus")
   private Integer userStatus;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -76,17 +76,17 @@ public User id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get username
    * @return username
-  **/
+   **/
   public String getUsername() {
     return username;
   }
 
   /**
-    * Set username
-  **/
+   * Set username
+   */
   public void setUsername(String username) {
     this.username = username;
   }
@@ -96,17 +96,17 @@ public User username(String username) {
     return this;
   }
 
- /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   **/
   public String getFirstName() {
     return firstName;
   }
 
   /**
-    * Set firstName
-  **/
+   * Set firstName
+   */
   public void setFirstName(String firstName) {
     this.firstName = firstName;
   }
@@ -116,17 +116,17 @@ public User firstName(String firstName) {
     return this;
   }
 
- /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   **/
   public String getLastName() {
     return lastName;
   }
 
   /**
-    * Set lastName
-  **/
+   * Set lastName
+   */
   public void setLastName(String lastName) {
     this.lastName = lastName;
   }
@@ -136,17 +136,17 @@ public User lastName(String lastName) {
     return this;
   }
 
- /**
+  /**
    * Get email
    * @return email
-  **/
+   **/
   public String getEmail() {
     return email;
   }
 
   /**
-    * Set email
-  **/
+   * Set email
+   */
   public void setEmail(String email) {
     this.email = email;
   }
@@ -156,17 +156,17 @@ public User email(String email) {
     return this;
   }
 
- /**
+  /**
    * Get password
    * @return password
-  **/
+   **/
   public String getPassword() {
     return password;
   }
 
   /**
-    * Set password
-  **/
+   * Set password
+   */
   public void setPassword(String password) {
     this.password = password;
   }
@@ -176,17 +176,17 @@ public User password(String password) {
     return this;
   }
 
- /**
+  /**
    * Get phone
    * @return phone
-  **/
+   **/
   public String getPhone() {
     return phone;
   }
 
   /**
-    * Set phone
-  **/
+   * Set phone
+   */
   public void setPhone(String phone) {
     this.phone = phone;
   }
@@ -196,17 +196,17 @@ public User phone(String phone) {
     return this;
   }
 
- /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   **/
   public Integer getUserStatus() {
     return userStatus;
   }
 
   /**
-    * Set userStatus
-  **/
+   * Set userStatus
+   */
   public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }
@@ -218,8 +218,8 @@ public User userStatus(Integer userStatus) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java
index d34db0dec2e9..9b8e0cd72052 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Category.java
@@ -25,7 +25,7 @@
 
 /**
   * A category for a pet
- **/
+  */
 
 public class Category  {
   
@@ -35,17 +35,17 @@ public class Category  {
   @JsonbProperty("name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -55,17 +55,17 @@ public Category id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -77,8 +77,8 @@ public Category name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index bb7520afb0b9..6afa6830d98c 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -25,7 +25,7 @@
 
 /**
   * Describes the result of uploading an image resource
- **/
+  */
 
 public class ModelApiResponse  {
   
@@ -38,17 +38,17 @@ public class ModelApiResponse  {
   @JsonbProperty("message")
   private String message;
 
- /**
+  /**
    * Get code
    * @return code
-  **/
+   **/
   public Integer getCode() {
     return code;
   }
 
   /**
-    * Set code
-  **/
+   * Set code
+   */
   public void setCode(Integer code) {
     this.code = code;
   }
@@ -58,17 +58,17 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
- /**
+  /**
    * Get type
    * @return type
-  **/
+   **/
   public String getType() {
     return type;
   }
 
   /**
-    * Set type
-  **/
+   * Set type
+   */
   public void setType(String type) {
     this.type = type;
   }
@@ -78,17 +78,17 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
- /**
+  /**
    * Get message
    * @return message
-  **/
+   **/
   public String getMessage() {
     return message;
   }
 
   /**
-    * Set message
-  **/
+   * Set message
+   */
   public void setMessage(String message) {
     this.message = message;
   }
@@ -100,8 +100,8 @@ public ModelApiResponse message(String message) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
index 204dc0ceb793..a111215c674d 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Order.java
@@ -26,7 +26,7 @@
 
 /**
   * An order for a pets from the pet store
- **/
+  */
 
 public class Order  {
   
@@ -85,25 +85,25 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   }
 
  /**
-   * Order Status
-  **/
+  * Order Status
+  */
   @JsonbProperty("status")
   private StatusEnum status;
 
   @JsonbProperty("complete")
   private Boolean complete = false;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -113,17 +113,17 @@ public Order id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get petId
    * @return petId
-  **/
+   **/
   public Long getPetId() {
     return petId;
   }
 
   /**
-    * Set petId
-  **/
+   * Set petId
+   */
   public void setPetId(Long petId) {
     this.petId = petId;
   }
@@ -133,17 +133,17 @@ public Order petId(Long petId) {
     return this;
   }
 
- /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   **/
   public Integer getQuantity() {
     return quantity;
   }
 
   /**
-    * Set quantity
-  **/
+   * Set quantity
+   */
   public void setQuantity(Integer quantity) {
     this.quantity = quantity;
   }
@@ -153,17 +153,17 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
- /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   **/
   public Date getShipDate() {
     return shipDate;
   }
 
   /**
-    * Set shipDate
-  **/
+   * Set shipDate
+   */
   public void setShipDate(Date shipDate) {
     this.shipDate = shipDate;
   }
@@ -173,17 +173,17 @@ public Order shipDate(Date shipDate) {
     return this;
   }
 
- /**
+  /**
    * Order Status
    * @return status
-  **/
+   **/
   public StatusEnum getStatus() {
     return status;
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
@@ -193,17 +193,17 @@ public Order status(StatusEnum status) {
     return this;
   }
 
- /**
+  /**
    * Get complete
    * @return complete
-  **/
+   **/
   public Boolean getComplete() {
     return complete;
   }
 
   /**
-    * Set complete
-  **/
+   * Set complete
+   */
   public void setComplete(Boolean complete) {
     this.complete = complete;
   }
@@ -215,8 +215,8 @@ public Order complete(Boolean complete) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
index 3efc500eec78..4da8d4dc7636 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -30,7 +30,7 @@
 
 /**
   * A pet for sale in the pet store
- **/
+  */
 
 public class Pet  {
   
@@ -92,22 +92,22 @@ public void serialize(StatusEnum obj, JsonGenerator generator, SerializationCont
   }
 
  /**
-   * pet status in the store
-  **/
+  * pet status in the store
+  */
   @JsonbProperty("status")
   private StatusEnum status;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -117,17 +117,17 @@ public Pet id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get category
    * @return category
-  **/
+   **/
   public Category getCategory() {
     return category;
   }
 
   /**
-    * Set category
-  **/
+   * Set category
+   */
   public void setCategory(Category category) {
     this.category = category;
   }
@@ -137,17 +137,17 @@ public Pet category(Category category) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -157,17 +157,17 @@ public Pet name(String name) {
     return this;
   }
 
- /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   **/
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
 
   /**
-    * Set photoUrls
-  **/
+   * Set photoUrls
+   */
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
@@ -185,17 +185,17 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
- /**
+  /**
    * Get tags
    * @return tags
-  **/
+   **/
   public List<Tag> getTags() {
     return tags;
   }
 
   /**
-    * Set tags
-  **/
+   * Set tags
+   */
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
@@ -213,19 +213,19 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
- /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   **/
   @Deprecated
   public StatusEnum getStatus() {
     return status;
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   public void setStatus(StatusEnum status) {
     this.status = status;
   }
@@ -237,8 +237,8 @@ public Pet status(StatusEnum status) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java
index 31b194923087..29afe967b747 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/Tag.java
@@ -25,7 +25,7 @@
 
 /**
   * A tag for a pet
- **/
+  */
 
 public class Tag  {
   
@@ -35,17 +35,17 @@ public class Tag  {
   @JsonbProperty("name")
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -55,17 +55,17 @@ public Tag id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   public String getName() {
     return name;
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   public void setName(String name) {
     this.name = name;
   }
@@ -77,8 +77,8 @@ public Tag name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java
index da9326887b10..67aba438db6a 100644
--- a/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/microprofile-rest-client/src/main/java/org/openapitools/client/model/User.java
@@ -25,7 +25,7 @@
 
 /**
   * A User who is purchasing from the pet store
- **/
+  */
 
 public class User  {
   
@@ -51,22 +51,22 @@ public class User  {
   private String phone;
 
  /**
-   * User Status
-  **/
+  * User Status
+  */
   @JsonbProperty("userStatus")
   private Integer userStatus;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   public Long getId() {
     return id;
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   public void setId(Long id) {
     this.id = id;
   }
@@ -76,17 +76,17 @@ public User id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get username
    * @return username
-  **/
+   **/
   public String getUsername() {
     return username;
   }
 
   /**
-    * Set username
-  **/
+   * Set username
+   */
   public void setUsername(String username) {
     this.username = username;
   }
@@ -96,17 +96,17 @@ public User username(String username) {
     return this;
   }
 
- /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   **/
   public String getFirstName() {
     return firstName;
   }
 
   /**
-    * Set firstName
-  **/
+   * Set firstName
+   */
   public void setFirstName(String firstName) {
     this.firstName = firstName;
   }
@@ -116,17 +116,17 @@ public User firstName(String firstName) {
     return this;
   }
 
- /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   **/
   public String getLastName() {
     return lastName;
   }
 
   /**
-    * Set lastName
-  **/
+   * Set lastName
+   */
   public void setLastName(String lastName) {
     this.lastName = lastName;
   }
@@ -136,17 +136,17 @@ public User lastName(String lastName) {
     return this;
   }
 
- /**
+  /**
    * Get email
    * @return email
-  **/
+   **/
   public String getEmail() {
     return email;
   }
 
   /**
-    * Set email
-  **/
+   * Set email
+   */
   public void setEmail(String email) {
     this.email = email;
   }
@@ -156,17 +156,17 @@ public User email(String email) {
     return this;
   }
 
- /**
+  /**
    * Get password
    * @return password
-  **/
+   **/
   public String getPassword() {
     return password;
   }
 
   /**
-    * Set password
-  **/
+   * Set password
+   */
   public void setPassword(String password) {
     this.password = password;
   }
@@ -176,17 +176,17 @@ public User password(String password) {
     return this;
   }
 
- /**
+  /**
    * Get phone
    * @return phone
-  **/
+   **/
   public String getPhone() {
     return phone;
   }
 
   /**
-    * Set phone
-  **/
+   * Set phone
+   */
   public void setPhone(String phone) {
     this.phone = phone;
   }
@@ -196,17 +196,17 @@ public User phone(String phone) {
     return this;
   }
 
- /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   **/
   public Integer getUserStatus() {
     return userStatus;
   }
 
   /**
-    * Set userStatus
-  **/
+   * Set userStatus
+   */
   public void setUserStatus(Integer userStatus) {
     this.userStatus = userStatus;
   }
@@ -218,8 +218,8 @@ public User userStatus(Integer userStatus) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3422bfa21e7d..7c6423c49611 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -90,14 +90,13 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, String> getMapProperty() {
     return mapProperty;
   }
@@ -123,14 +122,13 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Map<String, String>> getMapOfMapProperty() {
     return mapOfMapProperty;
   }
@@ -148,13 +146,12 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getAnytype1() {
         return anytype1.orElse(null);
   }
@@ -181,14 +178,13 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype1(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype1
    * @return mapWithUndeclaredPropertiesAnytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getMapWithUndeclaredPropertiesAnytype1() {
     return mapWithUndeclaredPropertiesAnytype1;
   }
@@ -206,14 +202,13 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype2(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype2
    * @return mapWithUndeclaredPropertiesAnytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getMapWithUndeclaredPropertiesAnytype2() {
     return mapWithUndeclaredPropertiesAnytype2;
   }
@@ -239,14 +234,13 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesAnytype3Item(Stri
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype3
    * @return mapWithUndeclaredPropertiesAnytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Object> getMapWithUndeclaredPropertiesAnytype3() {
     return mapWithUndeclaredPropertiesAnytype3;
   }
@@ -264,14 +258,13 @@ public AdditionalPropertiesClass emptyMap(Object emptyMap) {
     return this;
   }
 
-   /**
+  /**
    * an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
    * @return emptyMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMPTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getEmptyMap() {
     return emptyMap;
   }
@@ -297,14 +290,13 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesStringItem(String
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesString
    * @return mapWithUndeclaredPropertiesString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, String> getMapWithUndeclaredPropertiesString() {
     return mapWithUndeclaredPropertiesString;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
index 7cc3bb0fd953..a3702c273b07 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Animal.java
@@ -66,14 +66,13 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
@@ -91,14 +90,13 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getColor() {
     return color;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java
index 0b841d2cda64..612aaa859f9c 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Apple.java
@@ -52,14 +52,13 @@ public Apple cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CULTIVAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getCultivar() {
     return cultivar;
   }
@@ -77,14 +76,13 @@ public Apple origin(String origin) {
     return this;
   }
 
-   /**
+  /**
    * Get origin
    * @return origin
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ORIGIN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getOrigin() {
     return origin;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java
index ee00bb89733c..eec47338dbec 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/AppleReq.java
@@ -52,14 +52,13 @@ public AppleReq cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CULTIVAR)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getCultivar() {
     return cultivar;
   }
@@ -77,14 +76,13 @@ public AppleReq mealy(Boolean mealy) {
     return this;
   }
 
-   /**
+  /**
    * Get mealy
    * @return mealy
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MEALY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getMealy() {
     return mealy;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 781d654cc314..973a9eed51b3 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -59,14 +59,13 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5ce6272649f3..1c6634533950 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -59,14 +59,13 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
index 3bcb33a5cfed..e149c67659ef 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -67,14 +67,13 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -100,14 +99,13 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -133,14 +131,13 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java
index 63beebe10559..48238f546494 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Banana.java
@@ -49,14 +49,13 @@ public Banana lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LENGTH_CM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getLengthCm() {
     return lengthCm;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java
index e8ee1977b6d6..8bd85e1f6369 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BananaReq.java
@@ -53,14 +53,13 @@ public BananaReq lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_LENGTH_CM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public BigDecimal getLengthCm() {
     return lengthCm;
   }
@@ -78,14 +77,13 @@ public BananaReq sweet(Boolean sweet) {
     return this;
   }
 
-   /**
+  /**
    * Get sweet
    * @return sweet
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SWEET)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getSweet() {
     return sweet;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java
index 60cdf6b778f6..e63fc80a2abc 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/BasquePig.java
@@ -48,14 +48,13 @@ public BasquePig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
index 5a4a72a3741b..9c30176ba37e 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -68,14 +68,13 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -93,14 +92,13 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -118,14 +116,13 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -143,14 +140,13 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -168,14 +164,13 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -193,14 +188,13 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
index 2e864543d127..b62d1a02664d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Cat.java
@@ -60,14 +60,13 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
index 79f6d45f4638..fb22fa92d05b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Category.java
@@ -52,14 +52,13 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java
index 0f7a12db1543..e213b0ab3adc 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ChildCat.java
@@ -65,14 +65,13 @@ public ChildCat name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
@@ -98,14 +97,13 @@ public ChildCat petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPetType() {
     return petType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
index 16061aa437fa..0befb5d4d374 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -48,14 +48,13 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
index addebdc9f8f3..372fe845c0bd 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Client.java
@@ -48,14 +48,13 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getClient() {
     return client;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
index 8019326384f0..ceae85195294 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
@@ -52,14 +52,13 @@ public ComplexQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public ComplexQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getQuadrilateralType() {
     return quadrilateralType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java
index ae622b263e88..be80ca1461b1 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DanishPig.java
@@ -48,14 +48,13 @@ public DanishPig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 84903b001637..239b19601488 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -50,14 +50,13 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
index cae50d815022..f3ad5db1e98d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Dog.java
@@ -59,14 +59,13 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBreed() {
     return breed;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java
index feca125b3f4d..bf1eb73ff570 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Drawing.java
@@ -76,14 +76,13 @@ public Drawing mainShape(Shape mainShape) {
     return this;
   }
 
-   /**
+  /**
    * Get mainShape
    * @return mainShape
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAIN_SHAPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Shape getMainShape() {
     return mainShape;
   }
@@ -101,14 +100,13 @@ public Drawing shapeOrNull(ShapeOrNull shapeOrNull) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeOrNull
    * @return shapeOrNull
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHAPE_OR_NULL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public ShapeOrNull getShapeOrNull() {
     return shapeOrNull;
   }
@@ -126,13 +124,12 @@ public Drawing nullableShape(NullableShape nullableShape) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableShape
    * @return nullableShape
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public NullableShape getNullableShape() {
         return nullableShape.orElse(null);
   }
@@ -167,14 +164,13 @@ public Drawing addShapesItem(Shape shapesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get shapes
    * @return shapes
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHAPES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Shape> getShapes() {
     return shapes;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
index 6360fb0525b5..9ccbf56245ca 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -124,14 +124,13 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -157,14 +156,13 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
index d4fc6cadaea7..3cf4fa4a66a5 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -267,14 +267,13 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -292,14 +291,13 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -317,14 +315,13 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -342,14 +339,13 @@ public EnumTest enumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
     return this;
   }
 
-   /**
+  /**
    * Get enumIntegerOnly
    * @return enumIntegerOnly
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumIntegerOnlyEnum getEnumIntegerOnly() {
     return enumIntegerOnly;
   }
@@ -367,14 +363,13 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -392,13 +387,12 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public OuterEnum getOuterEnum() {
         return outerEnum.orElse(null);
   }
@@ -425,14 +419,13 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OuterEnumInteger getOuterEnumInteger() {
     return outerEnumInteger;
   }
@@ -450,14 +443,13 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OuterEnumDefaultValue getOuterEnumDefaultValue() {
     return outerEnumDefaultValue;
   }
@@ -475,14 +467,13 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() {
     return outerEnumIntegerDefaultValue;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
index d61593d711ed..e612ef514bd1 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
@@ -52,14 +52,13 @@ public EquilateralTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public EquilateralTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index 3b906d17a0ce..d3f48f3e539b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -55,14 +55,13 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getSomeId() {
     return someId;
   }
@@ -88,14 +87,13 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, BigDecimal> getSomeMap() {
     return someMap;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8286ab64c82e..85c17c8f4d88 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -55,14 +55,13 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public ModelFile getFile() {
     return _file;
   }
@@ -88,14 +87,13 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<ModelFile> getFiles() {
     return files;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java
index 6b6d53138845..2dbe0e847759 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Foo.java
@@ -48,14 +48,13 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBar() {
     return bar;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index adad4fbfb5a5..2fd8a04551e8 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -49,14 +49,13 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Foo getString() {
     return string;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
index 335e9e31effd..63b0be4724dc 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -113,16 +113,15 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getInteger() {
     return integer;
   }
@@ -140,16 +139,15 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getInt32() {
     return int32;
   }
@@ -167,14 +165,13 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getInt64() {
     return int64;
   }
@@ -192,16 +189,15 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public BigDecimal getNumber() {
     return number;
   }
@@ -219,16 +215,15 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Float getFloat() {
     return _float;
   }
@@ -246,16 +241,15 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Double getDouble() {
     return _double;
   }
@@ -273,14 +267,13 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getDecimal() {
     return decimal;
   }
@@ -298,14 +291,13 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getString() {
     return string;
   }
@@ -323,14 +315,13 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public byte[] getByte() {
     return _byte;
   }
@@ -348,14 +339,13 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public File getBinary() {
     return binary;
   }
@@ -373,14 +363,13 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public LocalDate getDate() {
     return date;
   }
@@ -398,14 +387,13 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -423,14 +411,13 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public UUID getUuid() {
     return uuid;
   }
@@ -448,14 +435,13 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getPassword() {
     return password;
   }
@@ -473,14 +459,13 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPatternWithDigits() {
     return patternWithDigits;
   }
@@ -498,14 +483,13 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPatternWithDigitsAndDelimiter() {
     return patternWithDigitsAndDelimiter;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
index 978e139e58fd..7f5b266b892d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
@@ -62,14 +62,13 @@ public GrandparentAnimal petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PET_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getPetType() {
     return petType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 147bab1ec605..98820cd20468 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -57,14 +57,13 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBar() {
     return bar;
   }
@@ -72,14 +71,13 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getFoo() {
     return foo;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 7af7a9cf3b83..a028321bf4bd 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -52,13 +52,12 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public String getNullableMessage() {
         return nullableMessage.orElse(null);
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
index 08daaf932ba9..e11c92bf9fd0 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
@@ -52,14 +52,13 @@ public IsoscelesTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public IsoscelesTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
index 1e47edc6a1d5..99e7f78d4796 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MapTest.java
@@ -105,14 +105,13 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -138,14 +137,13 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -171,14 +169,13 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -204,14 +201,13 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a7dce3b74540..e698f33a2b86 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -61,14 +61,13 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public UUID getUuid() {
     return uuid;
   }
@@ -86,14 +85,13 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -119,14 +117,13 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
index b3451d48b559..587e3682e3be 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -52,14 +52,13 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getName() {
     return name;
   }
@@ -77,14 +76,13 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 24f5219d19ce..8ff4c489515b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -56,14 +56,13 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getCode() {
     return code;
   }
@@ -81,14 +80,13 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getType() {
     return type;
   }
@@ -106,14 +104,13 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getMessage() {
     return message;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java
index f687543faf0c..502044aa4475 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -48,14 +48,13 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java
index 90998395ec22..d7f75c62cba6 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelList.java
@@ -48,14 +48,13 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String get123list() {
     return _123list;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
index efcb0bdf0b69..142b61d586d7 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -48,14 +48,13 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
index 67885182db1b..366fa4df2797 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Name.java
@@ -70,14 +70,13 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public Integer getName() {
     return name;
   }
@@ -90,14 +89,13 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -110,14 +108,13 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getProperty() {
     return property;
   }
@@ -130,14 +127,13 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer get123number() {
     return _123number;
   }
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 aa0e2791c16a..1b4e531c738e 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
@@ -107,13 +107,12 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Integer getIntegerProp() {
         return integerProp.orElse(null);
   }
@@ -140,13 +139,12 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public BigDecimal getNumberProp() {
         return numberProp.orElse(null);
   }
@@ -173,13 +171,12 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Boolean getBooleanProp() {
         return booleanProp.orElse(null);
   }
@@ -206,13 +203,12 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public String getStringProp() {
         return stringProp.orElse(null);
   }
@@ -239,13 +235,12 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public LocalDate getDateProp() {
         return dateProp.orElse(null);
   }
@@ -272,13 +267,12 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public OffsetDateTime getDatetimeProp() {
         return datetimeProp.orElse(null);
   }
@@ -317,13 +311,12 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public List<Object> getArrayNullableProp() {
         return arrayNullableProp.orElse(null);
   }
@@ -362,13 +355,12 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public List<Object> getArrayAndItemsNullableProp() {
         return arrayAndItemsNullableProp.orElse(null);
   }
@@ -403,14 +395,13 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Object> getArrayItemsNullable() {
     return arrayItemsNullable;
   }
@@ -440,13 +431,12 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Map<String, Object> getObjectNullableProp() {
         return objectNullableProp.orElse(null);
   }
@@ -485,13 +475,12 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Map<String, Object> getObjectAndItemsNullableProp() {
         return objectAndItemsNullableProp.orElse(null);
   }
@@ -526,14 +515,13 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Object> getObjectItemsNullable() {
     return objectItemsNullable;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
index ab57aa213279..009b1563bc4a 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -49,14 +49,13 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 589328d9b59f..703a2b02066c 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -64,14 +64,13 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getUuid() {
     return uuid;
   }
@@ -89,16 +88,15 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getId() {
     return id;
   }
@@ -116,16 +114,15 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public DeprecatedObject getDeprecatedRef() {
     return deprecatedRef;
   }
@@ -151,16 +148,15 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<String> getBars() {
     return bars;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
index 8e82b7c362a8..78e5ed478cdc 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Order.java
@@ -106,14 +106,13 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -131,14 +130,13 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getPetId() {
     return petId;
   }
@@ -156,14 +154,13 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getQuantity() {
     return quantity;
   }
@@ -181,14 +178,13 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -206,14 +202,13 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public StatusEnum getStatus() {
     return status;
   }
@@ -231,14 +226,13 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
index 71c635222e8c..2b096913df1d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -57,14 +57,13 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -82,14 +81,13 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getMyString() {
     return myString;
   }
@@ -107,14 +105,13 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
index b6d82d5e3822..c863d1f83269 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,14 +109,13 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -134,14 +133,13 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Category getCategory() {
     return category;
   }
@@ -159,14 +157,13 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getName() {
     return name;
   }
@@ -192,14 +189,13 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -225,14 +221,13 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Tag> getTags() {
     return tags;
   }
@@ -250,14 +245,13 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
index af070c76bb48..4d8fae8ea940 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
@@ -48,14 +48,13 @@ public QuadrilateralInterface quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getQuadrilateralType() {
     return quadrilateralType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 63b6b5b629a0..5b49f0c17956 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -55,14 +55,13 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBar() {
     return bar;
   }
@@ -75,14 +74,13 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBaz() {
     return baz;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
index 6bce242d0974..a924033ef2b5 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -52,14 +52,13 @@ public ScaleneTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public ScaleneTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java
index ec1d70b01781..b6f64f9ec15c 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ShapeInterface.java
@@ -48,14 +48,13 @@ public ShapeInterface shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
index 226f8fa21e98..d27187c99b92 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
@@ -52,14 +52,13 @@ public SimpleQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public SimpleQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getQuadrilateralType() {
     return quadrilateralType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8cdcb52f6415..c9423411da0f 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -52,14 +52,13 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
@@ -77,14 +76,13 @@ public SpecialModelName specialModelName(String specialModelName) {
     return this;
   }
 
-   /**
+  /**
    * Get specialModelName
    * @return specialModelName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SPECIAL_MODEL_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSpecialModelName() {
     return specialModelName;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java
index 84ac9e813c3f..400b4676a372 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Tag.java
@@ -52,14 +52,13 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index 6c8770f1fbfc..5137f705804b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -54,14 +54,13 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSomeProperty() {
     return someProperty;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TriangleInterface.java
index b0a3e0ca9dbe..a7c6fa20c86d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/TriangleInterface.java
@@ -48,14 +48,13 @@ public TriangleInterface triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java
index 8b5c7dbf77a2..fde1ea30bfb6 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/User.java
@@ -96,14 +96,13 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -121,14 +120,13 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getUsername() {
     return username;
   }
@@ -146,14 +144,13 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getFirstName() {
     return firstName;
   }
@@ -171,14 +168,13 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getLastName() {
     return lastName;
   }
@@ -196,14 +192,13 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getEmail() {
     return email;
   }
@@ -221,14 +216,13 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPassword() {
     return password;
   }
@@ -246,14 +240,13 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPhone() {
     return phone;
   }
@@ -271,14 +264,13 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getUserStatus() {
     return userStatus;
   }
@@ -296,14 +288,13 @@ public User objectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
    * @return objectWithNoDeclaredProps
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getObjectWithNoDeclaredProps() {
     return objectWithNoDeclaredProps;
   }
@@ -321,13 +312,12 @@ public User objectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNu
     return this;
   }
 
-   /**
+  /**
    * test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
    * @return objectWithNoDeclaredPropsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getObjectWithNoDeclaredPropsNullable() {
         return objectWithNoDeclaredPropsNullable.orElse(null);
   }
@@ -354,13 +344,12 @@ public User anyTypeProp(Object anyTypeProp) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
    * @return anyTypeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getAnyTypeProp() {
         return anyTypeProp.orElse(null);
   }
@@ -387,13 +376,12 @@ public User anyTypePropNullable(Object anyTypePropNullable) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.
    * @return anyTypePropNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getAnyTypePropNullable() {
         return anyTypePropNullable.orElse(null);
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Whale.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Whale.java
index cff95aae2693..d21f39530f96 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Whale.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Whale.java
@@ -56,14 +56,13 @@ public Whale hasBaleen(Boolean hasBaleen) {
     return this;
   }
 
-   /**
+  /**
    * Get hasBaleen
    * @return hasBaleen
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_HAS_BALEEN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getHasBaleen() {
     return hasBaleen;
   }
@@ -81,14 +80,13 @@ public Whale hasTeeth(Boolean hasTeeth) {
     return this;
   }
 
-   /**
+  /**
    * Get hasTeeth
    * @return hasTeeth
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_HAS_TEETH)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getHasTeeth() {
     return hasTeeth;
   }
@@ -106,14 +104,13 @@ public Whale className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Zebra.java
index d09e3ea97f4a..d9628f40bbd9 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/Zebra.java
@@ -95,14 +95,13 @@ public Zebra type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public TypeEnum getType() {
     return type;
   }
@@ -120,14 +119,13 @@ public Zebra className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java
index f95377e03aa2..6f65ea384a2e 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Category.java
@@ -52,14 +52,13 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index d8e2cef264fa..1d772b9f3518 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -56,14 +56,13 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getCode() {
     return code;
   }
@@ -81,14 +80,13 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getType() {
     return type;
   }
@@ -106,14 +104,13 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getMessage() {
     return message;
   }
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java
index 01ce02aefb1f..918c82b5fc3b 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Order.java
@@ -106,14 +106,13 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -131,14 +130,13 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getPetId() {
     return petId;
   }
@@ -156,14 +154,13 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getQuantity() {
     return quantity;
   }
@@ -181,14 +178,13 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -206,14 +202,13 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public StatusEnum getStatus() {
     return status;
   }
@@ -231,14 +226,13 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java
index 03d29c5ebd2a..8611e23dcf0e 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,14 +109,13 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -134,14 +133,13 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Category getCategory() {
     return category;
   }
@@ -159,14 +157,13 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getName() {
     return name;
   }
@@ -192,14 +189,13 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -225,14 +221,13 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Tag> getTags() {
     return tags;
   }
@@ -250,16 +245,15 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java
index 694b9f3643cf..a22d191092a0 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/Tag.java
@@ -52,14 +52,13 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java
index 31c9aefd557b..2d4a40eb4c4d 100644
--- a/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/native-jakarta/src/main/java/org/openapitools/client/model/User.java
@@ -76,14 +76,13 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -101,14 +100,13 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getUsername() {
     return username;
   }
@@ -126,14 +124,13 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getFirstName() {
     return firstName;
   }
@@ -151,14 +148,13 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getLastName() {
     return lastName;
   }
@@ -176,14 +172,13 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getEmail() {
     return email;
   }
@@ -201,14 +196,13 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPassword() {
     return password;
   }
@@ -226,14 +220,13 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPhone() {
     return phone;
   }
@@ -251,14 +244,13 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 156e833b68fd..3e3ab863829f 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -90,14 +90,13 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, String> getMapProperty() {
     return mapProperty;
   }
@@ -123,14 +122,13 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Map<String, String>> getMapOfMapProperty() {
     return mapOfMapProperty;
   }
@@ -148,13 +146,12 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getAnytype1() {
         return anytype1.orElse(null);
   }
@@ -181,14 +178,13 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype1(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype1
    * @return mapWithUndeclaredPropertiesAnytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getMapWithUndeclaredPropertiesAnytype1() {
     return mapWithUndeclaredPropertiesAnytype1;
   }
@@ -206,14 +202,13 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype2(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype2
    * @return mapWithUndeclaredPropertiesAnytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getMapWithUndeclaredPropertiesAnytype2() {
     return mapWithUndeclaredPropertiesAnytype2;
   }
@@ -239,14 +234,13 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesAnytype3Item(Stri
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype3
    * @return mapWithUndeclaredPropertiesAnytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Object> getMapWithUndeclaredPropertiesAnytype3() {
     return mapWithUndeclaredPropertiesAnytype3;
   }
@@ -264,14 +258,13 @@ public AdditionalPropertiesClass emptyMap(Object emptyMap) {
     return this;
   }
 
-   /**
+  /**
    * an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
    * @return emptyMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMPTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getEmptyMap() {
     return emptyMap;
   }
@@ -297,14 +290,13 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesStringItem(String
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesString
    * @return mapWithUndeclaredPropertiesString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, String> getMapWithUndeclaredPropertiesString() {
     return mapWithUndeclaredPropertiesString;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
index 9c9150405783..da381ee6a22c 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
@@ -66,14 +66,13 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
@@ -91,14 +90,13 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getColor() {
     return color;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java
index 2b347a813e62..1e783d132112 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Apple.java
@@ -52,14 +52,13 @@ public Apple cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CULTIVAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getCultivar() {
     return cultivar;
   }
@@ -77,14 +76,13 @@ public Apple origin(String origin) {
     return this;
   }
 
-   /**
+  /**
    * Get origin
    * @return origin
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ORIGIN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getOrigin() {
     return origin;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java
index 36c5a1239ca2..e19c24e5713e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AppleReq.java
@@ -52,14 +52,13 @@ public AppleReq cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CULTIVAR)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getCultivar() {
     return cultivar;
   }
@@ -77,14 +76,13 @@ public AppleReq mealy(Boolean mealy) {
     return this;
   }
 
-   /**
+  /**
    * Get mealy
    * @return mealy
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MEALY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getMealy() {
     return mealy;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 3f9bcb76004e..0e07f8caaa1e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -59,14 +59,13 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2497ce10cfe0..69e6d70b5383 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -59,14 +59,13 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
index c3c1ac9e9af1..ceca4dbe4c08 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -67,14 +67,13 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -100,14 +99,13 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -133,14 +131,13 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java
index 46668a213f6a..e45e928a75b0 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Banana.java
@@ -49,14 +49,13 @@ public Banana lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LENGTH_CM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getLengthCm() {
     return lengthCm;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java
index a963fd4df112..b4a0d779c742 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BananaReq.java
@@ -53,14 +53,13 @@ public BananaReq lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_LENGTH_CM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public BigDecimal getLengthCm() {
     return lengthCm;
   }
@@ -78,14 +77,13 @@ public BananaReq sweet(Boolean sweet) {
     return this;
   }
 
-   /**
+  /**
    * Get sweet
    * @return sweet
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SWEET)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getSweet() {
     return sweet;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java
index d1fea74004ce..857683a48395 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/BasquePig.java
@@ -48,14 +48,13 @@ public BasquePig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
index 0c9584cd5cae..118efddda89e 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -68,14 +68,13 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -93,14 +92,13 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -118,14 +116,13 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -143,14 +140,13 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -168,14 +164,13 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -193,14 +188,13 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
index 87882ac9e632..fdf0ce9830b8 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
@@ -60,14 +60,13 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
index 1fa8481a8cd8..8df8a369ebad 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
@@ -52,14 +52,13 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java
index 4c58be5abc79..730924ddabb6 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ChildCat.java
@@ -65,14 +65,13 @@ public ChildCat name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
@@ -98,14 +97,13 @@ public ChildCat petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPetType() {
     return petType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
index 1bed990abe28..a68198e2e488 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -48,14 +48,13 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
index 2423467a3429..b4f305d13d74 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
@@ -48,14 +48,13 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getClient() {
     return client;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
index 95ffa9905ee6..262f3cc1f801 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
@@ -52,14 +52,13 @@ public ComplexQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public ComplexQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getQuadrilateralType() {
     return quadrilateralType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java
index bb5694874ac1..f642b3507360 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DanishPig.java
@@ -48,14 +48,13 @@ public DanishPig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index ed552fda57d2..208e47e7e197 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -50,14 +50,13 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
index 89879e50c46a..5c2c6a1407ef 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
@@ -59,14 +59,13 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBreed() {
     return breed;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java
index f91f60b96f9b..6fe7f3a3f678 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Drawing.java
@@ -76,14 +76,13 @@ public Drawing mainShape(Shape mainShape) {
     return this;
   }
 
-   /**
+  /**
    * Get mainShape
    * @return mainShape
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAIN_SHAPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Shape getMainShape() {
     return mainShape;
   }
@@ -101,14 +100,13 @@ public Drawing shapeOrNull(ShapeOrNull shapeOrNull) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeOrNull
    * @return shapeOrNull
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHAPE_OR_NULL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public ShapeOrNull getShapeOrNull() {
     return shapeOrNull;
   }
@@ -126,13 +124,12 @@ public Drawing nullableShape(NullableShape nullableShape) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableShape
    * @return nullableShape
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public NullableShape getNullableShape() {
         return nullableShape.orElse(null);
   }
@@ -167,14 +164,13 @@ public Drawing addShapesItem(Shape shapesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get shapes
    * @return shapes
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHAPES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Shape> getShapes() {
     return shapes;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
index c1ecf705a97e..b571239b3182 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -124,14 +124,13 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -157,14 +156,13 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
index 00f7564e53ee..5d05f7967a6d 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -267,14 +267,13 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -292,14 +291,13 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -317,14 +315,13 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -342,14 +339,13 @@ public EnumTest enumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
     return this;
   }
 
-   /**
+  /**
    * Get enumIntegerOnly
    * @return enumIntegerOnly
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumIntegerOnlyEnum getEnumIntegerOnly() {
     return enumIntegerOnly;
   }
@@ -367,14 +363,13 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -392,13 +387,12 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public OuterEnum getOuterEnum() {
         return outerEnum.orElse(null);
   }
@@ -425,14 +419,13 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OuterEnumInteger getOuterEnumInteger() {
     return outerEnumInteger;
   }
@@ -450,14 +443,13 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OuterEnumDefaultValue getOuterEnumDefaultValue() {
     return outerEnumDefaultValue;
   }
@@ -475,14 +467,13 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() {
     return outerEnumIntegerDefaultValue;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
index 5ee54360fa21..242037af82d2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
@@ -52,14 +52,13 @@ public EquilateralTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public EquilateralTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index 0c54f2550b0a..b05fc257d581 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -55,14 +55,13 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getSomeId() {
     return someId;
   }
@@ -88,14 +87,13 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, BigDecimal> getSomeMap() {
     return someMap;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 04e7ddad6989..75168b37b1d6 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -55,14 +55,13 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public ModelFile getFile() {
     return _file;
   }
@@ -88,14 +87,13 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<ModelFile> getFiles() {
     return files;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java
index 8404e0c51b6f..4ccdb6bbb239 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Foo.java
@@ -48,14 +48,13 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBar() {
     return bar;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index a457967c58b2..dfa14fa6bbc8 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -49,14 +49,13 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Foo getString() {
     return string;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
index 3774c4fe7104..364ffcb87b4c 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -113,16 +113,15 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getInteger() {
     return integer;
   }
@@ -140,16 +139,15 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getInt32() {
     return int32;
   }
@@ -167,14 +165,13 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getInt64() {
     return int64;
   }
@@ -192,16 +189,15 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public BigDecimal getNumber() {
     return number;
   }
@@ -219,16 +215,15 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Float getFloat() {
     return _float;
   }
@@ -246,16 +241,15 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Double getDouble() {
     return _double;
   }
@@ -273,14 +267,13 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getDecimal() {
     return decimal;
   }
@@ -298,14 +291,13 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getString() {
     return string;
   }
@@ -323,14 +315,13 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public byte[] getByte() {
     return _byte;
   }
@@ -348,14 +339,13 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public File getBinary() {
     return binary;
   }
@@ -373,14 +363,13 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public LocalDate getDate() {
     return date;
   }
@@ -398,14 +387,13 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -423,14 +411,13 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public UUID getUuid() {
     return uuid;
   }
@@ -448,14 +435,13 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getPassword() {
     return password;
   }
@@ -473,14 +459,13 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPatternWithDigits() {
     return patternWithDigits;
   }
@@ -498,14 +483,13 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPatternWithDigitsAndDelimiter() {
     return patternWithDigitsAndDelimiter;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
index 77b2c1aca22a..25921f739fbe 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
@@ -62,14 +62,13 @@ public GrandparentAnimal petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PET_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getPetType() {
     return petType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index c297606be7d1..5274dd8aa6d5 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -57,14 +57,13 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBar() {
     return bar;
   }
@@ -72,14 +71,13 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getFoo() {
     return foo;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 7ee718a461e3..5f0c4990958a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -52,13 +52,12 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public String getNullableMessage() {
         return nullableMessage.orElse(null);
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
index be0d55257929..118d19cb7ba0 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
@@ -52,14 +52,13 @@ public IsoscelesTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public IsoscelesTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
index a904f8483e87..8772450981ee 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
@@ -105,14 +105,13 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -138,14 +137,13 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -171,14 +169,13 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -204,14 +201,13 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c15bbf1bd23..b5df1680067a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -61,14 +61,13 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public UUID getUuid() {
     return uuid;
   }
@@ -86,14 +85,13 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -119,14 +117,13 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
index b1a77447054f..07181fcedc99 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -52,14 +52,13 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getName() {
     return name;
   }
@@ -77,14 +76,13 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 1a553b986676..6822df2c2f34 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -56,14 +56,13 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getCode() {
     return code;
   }
@@ -81,14 +80,13 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getType() {
     return type;
   }
@@ -106,14 +104,13 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getMessage() {
     return message;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java
index 9df68eab3094..6a444a44d959 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -48,14 +48,13 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java
index 8a375e98ff24..9e159d761cc7 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelList.java
@@ -48,14 +48,13 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String get123list() {
     return _123list;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
index 42e7e420175f..94d4b3b82838 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -48,14 +48,13 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
index da3a59b01b25..4e8892fd448f 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
@@ -70,14 +70,13 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public Integer getName() {
     return name;
   }
@@ -90,14 +89,13 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -110,14 +108,13 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getProperty() {
     return property;
   }
@@ -130,14 +127,13 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer get123number() {
     return _123number;
   }
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 a568d2b48a0a..3a0fcf856792 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
@@ -107,13 +107,12 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Integer getIntegerProp() {
         return integerProp.orElse(null);
   }
@@ -140,13 +139,12 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public BigDecimal getNumberProp() {
         return numberProp.orElse(null);
   }
@@ -173,13 +171,12 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Boolean getBooleanProp() {
         return booleanProp.orElse(null);
   }
@@ -206,13 +203,12 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public String getStringProp() {
         return stringProp.orElse(null);
   }
@@ -239,13 +235,12 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public LocalDate getDateProp() {
         return dateProp.orElse(null);
   }
@@ -272,13 +267,12 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public OffsetDateTime getDatetimeProp() {
         return datetimeProp.orElse(null);
   }
@@ -317,13 +311,12 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public List<Object> getArrayNullableProp() {
         return arrayNullableProp.orElse(null);
   }
@@ -362,13 +355,12 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public List<Object> getArrayAndItemsNullableProp() {
         return arrayAndItemsNullableProp.orElse(null);
   }
@@ -403,14 +395,13 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Object> getArrayItemsNullable() {
     return arrayItemsNullable;
   }
@@ -440,13 +431,12 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Map<String, Object> getObjectNullableProp() {
         return objectNullableProp.orElse(null);
   }
@@ -485,13 +475,12 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Map<String, Object> getObjectAndItemsNullableProp() {
         return objectAndItemsNullableProp.orElse(null);
   }
@@ -526,14 +515,13 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
-
   public Map<String, Object> getObjectItemsNullable() {
     return objectItemsNullable;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
index 121fb9b74cfa..c5826eff5299 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -49,14 +49,13 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 06c7298c78db..ad15dc8d484f 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -64,14 +64,13 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getUuid() {
     return uuid;
   }
@@ -89,16 +88,15 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getId() {
     return id;
   }
@@ -116,16 +114,15 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public DeprecatedObject getDeprecatedRef() {
     return deprecatedRef;
   }
@@ -151,16 +148,15 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<String> getBars() {
     return bars;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
index 152d9fd2033d..93e2aa5c0837 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
@@ -106,14 +106,13 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -131,14 +130,13 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getPetId() {
     return petId;
   }
@@ -156,14 +154,13 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getQuantity() {
     return quantity;
   }
@@ -181,14 +178,13 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -206,14 +202,13 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public StatusEnum getStatus() {
     return status;
   }
@@ -231,14 +226,13 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
index c78c4e813ea9..7a4f1a950f8a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -57,14 +57,13 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -82,14 +81,13 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getMyString() {
     return myString;
   }
@@ -107,14 +105,13 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
index 0393f5f4de49..34f167faba0b 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,14 +109,13 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -134,14 +133,13 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Category getCategory() {
     return category;
   }
@@ -159,14 +157,13 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getName() {
     return name;
   }
@@ -192,14 +189,13 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -225,14 +221,13 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public List<Tag> getTags() {
     return tags;
   }
@@ -250,14 +245,13 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
index bd03d5cd6f03..1b937afb6d01 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
@@ -48,14 +48,13 @@ public QuadrilateralInterface quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getQuadrilateralType() {
     return quadrilateralType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index dc5ff8182c5a..46e9cfb09a50 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -55,14 +55,13 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBar() {
     return bar;
   }
@@ -75,14 +74,13 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getBaz() {
     return baz;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
index 28d1f933f6d6..daa09027431a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -52,14 +52,13 @@ public ScaleneTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public ScaleneTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java
index afab07f765a9..67561fc4c848 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ShapeInterface.java
@@ -48,14 +48,13 @@ public ShapeInterface shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
index 9d08a07b0999..a3eb84223139 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
@@ -52,14 +52,13 @@ public SimpleQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getShapeType() {
     return shapeType;
   }
@@ -77,14 +76,13 @@ public SimpleQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getQuadrilateralType() {
     return quadrilateralType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
index c0bbda3f8948..036d1093bab2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -52,14 +52,13 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
@@ -77,14 +76,13 @@ public SpecialModelName specialModelName(String specialModelName) {
     return this;
   }
 
-   /**
+  /**
    * Get specialModelName
    * @return specialModelName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SPECIAL_MODEL_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSpecialModelName() {
     return specialModelName;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
index fce946808a94..254ad80812a4 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
@@ -52,14 +52,13 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -77,14 +76,13 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index bbd7e8f66fb3..6a6ad21a8eee 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -54,14 +54,13 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getSomeProperty() {
     return someProperty;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TriangleInterface.java
index dd6e21843ac7..5b7a130bf684 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TriangleInterface.java
@@ -48,14 +48,13 @@ public TriangleInterface triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getTriangleType() {
     return triangleType;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
index c7d197baa70f..1a8bcce95ca2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
@@ -96,14 +96,13 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Long getId() {
     return id;
   }
@@ -121,14 +120,13 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getUsername() {
     return username;
   }
@@ -146,14 +144,13 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getFirstName() {
     return firstName;
   }
@@ -171,14 +168,13 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getLastName() {
     return lastName;
   }
@@ -196,14 +192,13 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getEmail() {
     return email;
   }
@@ -221,14 +216,13 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPassword() {
     return password;
   }
@@ -246,14 +240,13 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public String getPhone() {
     return phone;
   }
@@ -271,14 +264,13 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Integer getUserStatus() {
     return userStatus;
   }
@@ -296,14 +288,13 @@ public User objectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
    * @return objectWithNoDeclaredProps
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Object getObjectWithNoDeclaredProps() {
     return objectWithNoDeclaredProps;
   }
@@ -321,13 +312,12 @@ public User objectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNu
     return this;
   }
 
-   /**
+  /**
    * test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
    * @return objectWithNoDeclaredPropsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getObjectWithNoDeclaredPropsNullable() {
         return objectWithNoDeclaredPropsNullable.orElse(null);
   }
@@ -354,13 +344,12 @@ public User anyTypeProp(Object anyTypeProp) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
    * @return anyTypeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getAnyTypeProp() {
         return anyTypeProp.orElse(null);
   }
@@ -387,13 +376,12 @@ public User anyTypePropNullable(Object anyTypePropNullable) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.
    * @return anyTypePropNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
-
   public Object getAnyTypePropNullable() {
         return anyTypePropNullable.orElse(null);
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Whale.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Whale.java
index 540bc70d53c6..4efa6a13c5a9 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Whale.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Whale.java
@@ -56,14 +56,13 @@ public Whale hasBaleen(Boolean hasBaleen) {
     return this;
   }
 
-   /**
+  /**
    * Get hasBaleen
    * @return hasBaleen
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_HAS_BALEEN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getHasBaleen() {
     return hasBaleen;
   }
@@ -81,14 +80,13 @@ public Whale hasTeeth(Boolean hasTeeth) {
     return this;
   }
 
-   /**
+  /**
    * Get hasTeeth
    * @return hasTeeth
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_HAS_TEETH)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public Boolean getHasTeeth() {
     return hasTeeth;
   }
@@ -106,14 +104,13 @@ public Whale className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Zebra.java
index 28d7f2abb09f..f8670a88b64b 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Zebra.java
@@ -95,14 +95,13 @@ public Zebra type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-
   public TypeEnum getType() {
     return type;
   }
@@ -120,14 +119,13 @@ public Zebra className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-
   public String getClassName() {
     return className;
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AllOfSimpleModel.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AllOfSimpleModel.java
index 646fb83384c7..7bafc997448d 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AllOfSimpleModel.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AllOfSimpleModel.java
@@ -73,10 +73,10 @@ public AllOfSimpleModel addArrayOfStringsItem(String arrayOfStringsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfStrings
    * @return arrayOfStrings
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getArrayOfStrings() {
     return arrayOfStrings;
@@ -185,12 +185,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("arrayOfStrings");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AllOfSimpleModel
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AllOfSimpleModel
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AllOfSimpleModel.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -285,22 +285,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AllOfSimpleModel given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AllOfSimpleModel
-  * @throws IOException if the JSON string is invalid with respect to AllOfSimpleModel
-  */
+  /**
+   * Create an instance of AllOfSimpleModel given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AllOfSimpleModel
+   * @throws IOException if the JSON string is invalid with respect to AllOfSimpleModel
+   */
   public static AllOfSimpleModel fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AllOfSimpleModel.class);
   }
 
- /**
-  * Convert an instance of AllOfSimpleModel to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AllOfSimpleModel to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Animal.java
index 03ff144d267c..a8e3301c75e8 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Animal.java
@@ -68,10 +68,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -87,10 +87,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   public String getColor() {
     return color;
@@ -202,12 +202,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Animal
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Animal
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Animal.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -229,22 +229,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of Animal given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Animal
-  * @throws IOException if the JSON string is invalid with respect to Animal
-  */
+  /**
+   * Create an instance of Animal given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Animal
+   * @throws IOException if the JSON string is invalid with respect to Animal
+   */
   public static Animal fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Animal.class);
   }
 
- /**
-  * Convert an instance of Animal to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Animal to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyTypeTest.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyTypeTest.java
index 2364d0a0bf4f..ae76ee50e4a0 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyTypeTest.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/AnyTypeTest.java
@@ -74,10 +74,10 @@ public AnyTypeTest anyTypeProperty(Object anyTypeProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get anyTypeProperty
    * @return anyTypeProperty
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnyTypeProperty() {
     return anyTypeProperty;
@@ -101,10 +101,10 @@ public AnyTypeTest addArrayPropItem(String arrayPropItem) {
     return this;
   }
 
-   /**
+  /**
    * test array in 3.1 spec
    * @return arrayProp
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayProp() {
     return arrayProp;
@@ -128,10 +128,10 @@ public AnyTypeTest addRefArrayPrefixItemsItem(String refArrayPrefixItemsItem) {
     return this;
   }
 
-   /**
+  /**
    * An item that was added to the queue. 
    * @return refArrayPrefixItems
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getRefArrayPrefixItems() {
     return refArrayPrefixItems;
@@ -256,12 +256,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AnyTypeTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AnyTypeTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AnyTypeTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -351,22 +351,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AnyTypeTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AnyTypeTest
-  * @throws IOException if the JSON string is invalid with respect to AnyTypeTest
-  */
+  /**
+   * Create an instance of AnyTypeTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AnyTypeTest
+   * @throws IOException if the JSON string is invalid with respect to AnyTypeTest
+   */
   public static AnyTypeTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AnyTypeTest.class);
   }
 
- /**
-  * Convert an instance of AnyTypeTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AnyTypeTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ArrayOfSameRef.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ArrayOfSameRef.java
index 014103fdacd3..4eb7f3f7a76a 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ArrayOfSameRef.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ArrayOfSameRef.java
@@ -82,10 +82,10 @@ public ArrayOfSameRef addArrayFooOneItem(Tag arrayFooOneItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayFooOne
    * @return arrayFooOne
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getArrayFooOne() {
     return arrayFooOne;
@@ -109,10 +109,10 @@ public ArrayOfSameRef addArrayFooTwoItem(Tag arrayFooTwoItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayFooTwo
    * @return arrayFooTwo
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getArrayFooTwo() {
     return arrayFooTwo;
@@ -136,10 +136,10 @@ public ArrayOfSameRef addArrayFooThreeItem(Tag arrayFooThreeItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayFooThree
    * @return arrayFooThree
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getArrayFooThree() {
     return arrayFooThree;
@@ -253,12 +253,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfSameRef
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfSameRef
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfSameRef.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -382,22 +382,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ArrayOfSameRef given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfSameRef
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfSameRef
-  */
+  /**
+   * Create an instance of ArrayOfSameRef given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfSameRef
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfSameRef
+   */
   public static ArrayOfSameRef fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfSameRef.class);
   }
 
- /**
-  * Convert an instance of ArrayOfSameRef to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfSameRef to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Cat.java
index fda8821bb7de..c567118b69f4 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Cat.java
@@ -65,10 +65,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getDeclawed() {
     return declawed;
@@ -181,12 +181,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Cat
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Cat
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Cat.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -274,22 +274,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Cat given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Cat
-  * @throws IOException if the JSON string is invalid with respect to Cat
-  */
+  /**
+   * Create an instance of Cat given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Cat
+   * @throws IOException if the JSON string is invalid with respect to Cat
+   */
   public static Cat fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Cat.class);
   }
 
- /**
-  * Convert an instance of Cat to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Cat to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Category.java
index d44eef955c1d..88be2276920f 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference1.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference1.java
index ed8141288400..c2596c969cf9 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference1.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference1.java
@@ -64,10 +64,10 @@ public CircularReference1 prop1(CircularReference2 prop1) {
     return this;
   }
 
-   /**
+  /**
    * Get prop1
    * @return prop1
-  **/
+   */
   @javax.annotation.Nullable
   public CircularReference2 getProp1() {
     return prop1;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to CircularReference1
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to CircularReference1
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!CircularReference1.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -266,22 +266,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of CircularReference1 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of CircularReference1
-  * @throws IOException if the JSON string is invalid with respect to CircularReference1
-  */
+  /**
+   * Create an instance of CircularReference1 given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of CircularReference1
+   * @throws IOException if the JSON string is invalid with respect to CircularReference1
+   */
   public static CircularReference1 fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, CircularReference1.class);
   }
 
- /**
-  * Convert an instance of CircularReference1 to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of CircularReference1 to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference2.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference2.java
index 0b7f348693ac..c6d96f39918f 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference2.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference2.java
@@ -64,10 +64,10 @@ public CircularReference2 prop1(CircularReference3 prop1) {
     return this;
   }
 
-   /**
+  /**
    * Get prop1
    * @return prop1
-  **/
+   */
   @javax.annotation.Nullable
   public CircularReference3 getProp1() {
     return prop1;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to CircularReference2
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to CircularReference2
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!CircularReference2.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -266,22 +266,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of CircularReference2 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of CircularReference2
-  * @throws IOException if the JSON string is invalid with respect to CircularReference2
-  */
+  /**
+   * Create an instance of CircularReference2 given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of CircularReference2
+   * @throws IOException if the JSON string is invalid with respect to CircularReference2
+   */
   public static CircularReference2 fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, CircularReference2.class);
   }
 
- /**
-  * Convert an instance of CircularReference2 to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of CircularReference2 to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference3.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference3.java
index 97731939cbcf..9f2399442ece 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference3.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/CircularReference3.java
@@ -64,10 +64,10 @@ public CircularReference3 prop1(CircularReference1 prop1) {
     return this;
   }
 
-   /**
+  /**
    * Get prop1
    * @return prop1
-  **/
+   */
   @javax.annotation.Nullable
   public CircularReference1 getProp1() {
     return prop1;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to CircularReference3
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to CircularReference3
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!CircularReference3.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -266,22 +266,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of CircularReference3 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of CircularReference3
-  * @throws IOException if the JSON string is invalid with respect to CircularReference3
-  */
+  /**
+   * Create an instance of CircularReference3 given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of CircularReference3
+   * @throws IOException if the JSON string is invalid with respect to CircularReference3
+   */
   public static CircularReference3 fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, CircularReference3.class);
   }
 
- /**
-  * Convert an instance of CircularReference3 to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of CircularReference3 to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Dog.java
index b7b6ae912cc5..ac0c6f6c2672 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Dog.java
@@ -65,10 +65,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   public String getBreed() {
     return breed;
@@ -181,12 +181,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Dog
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Dog
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Dog.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -274,22 +274,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Dog given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Dog
-  * @throws IOException if the JSON string is invalid with respect to Dog
-  */
+  /**
+   * Create an instance of Dog given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Dog
+   * @throws IOException if the JSON string is invalid with respect to Dog
+   */
   public static Dog fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Dog.class);
   }
 
- /**
-  * Convert an instance of Dog to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Dog to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 4ea1bf010a49..4c14d2d89b8d 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -71,10 +71,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -90,10 +90,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -226,12 +226,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -319,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java
index 42e5eb284a66..bd8d219dcc74 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Order.java
@@ -138,10 +138,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -157,10 +157,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -176,10 +176,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -195,10 +195,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -359,12 +359,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -453,22 +453,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java
index d841f322fda1..71e425deb930 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Pet.java
@@ -142,10 +142,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -161,10 +161,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -180,10 +180,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -207,10 +207,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -234,10 +234,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -254,11 +254,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
@@ -385,12 +385,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -513,22 +513,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/SimpleModelWithArrayProperty.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/SimpleModelWithArrayProperty.java
index 06c92a5f08c0..4ad6a2c2b1e2 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/SimpleModelWithArrayProperty.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/SimpleModelWithArrayProperty.java
@@ -73,10 +73,10 @@ public SimpleModelWithArrayProperty addArrayOfStringsItem(String arrayOfStringsI
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfStrings
    * @return arrayOfStrings
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getArrayOfStrings() {
     return arrayOfStrings;
@@ -185,12 +185,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("arrayOfStrings");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to SimpleModelWithArrayProperty
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to SimpleModelWithArrayProperty
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!SimpleModelWithArrayProperty.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -285,22 +285,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of SimpleModelWithArrayProperty given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of SimpleModelWithArrayProperty
-  * @throws IOException if the JSON string is invalid with respect to SimpleModelWithArrayProperty
-  */
+  /**
+   * Create an instance of SimpleModelWithArrayProperty given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of SimpleModelWithArrayProperty
+   * @throws IOException if the JSON string is invalid with respect to SimpleModelWithArrayProperty
+   */
   public static SimpleModelWithArrayProperty fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, SimpleModelWithArrayProperty.class);
   }
 
- /**
-  * Convert an instance of SimpleModelWithArrayProperty to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of SimpleModelWithArrayProperty to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Tag.java
index 01f321916d54..3e04f184a3d6 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/User.java
index d3c9d69da4bb..68c8321d11bc 100644
--- a/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-3.1/src/main/java/org/openapitools/client/model/User.java
@@ -91,10 +91,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -129,10 +129,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -167,10 +167,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -186,10 +186,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -205,10 +205,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -224,10 +224,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -356,12 +356,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -461,22 +461,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Category.java
index d44eef955c1d..88be2276920f 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 4ea1bf010a49..4c14d2d89b8d 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -71,10 +71,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -90,10 +90,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -226,12 +226,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -319,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java
index 42e5eb284a66..bd8d219dcc74 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Order.java
@@ -138,10 +138,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -157,10 +157,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -176,10 +176,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -195,10 +195,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -359,12 +359,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -453,22 +453,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 d841f322fda1..71e425deb930 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
@@ -142,10 +142,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -161,10 +161,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -180,10 +180,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -207,10 +207,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -234,10 +234,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -254,11 +254,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
@@ -385,12 +385,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -513,22 +513,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Tag.java
index 01f321916d54..3e04f184a3d6 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/User.java
index d3c9d69da4bb..68c8321d11bc 100644
--- a/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/src/main/java/org/openapitools/client/model/User.java
@@ -91,10 +91,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -129,10 +129,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -167,10 +167,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -186,10 +186,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -205,10 +205,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -224,10 +224,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -356,12 +356,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -461,22 +461,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9ec03c8e97a0..33c079cd71dd 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -63,10 +63,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesAnyType
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesAnyType
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesAnyType.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesAnyType given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesAnyType
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesAnyType
-  */
+  /**
+   * Create an instance of AdditionalPropertiesAnyType given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesAnyType
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesAnyType
+   */
   public static AdditionalPropertiesAnyType fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesAnyType.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesAnyType to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesAnyType to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index cc08c00c2466..95a5245e5b23 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -64,10 +64,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesArray
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesArray
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesArray.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -265,22 +265,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesArray given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesArray
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesArray
-  */
+  /**
+   * Create an instance of AdditionalPropertiesArray given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesArray
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesArray
+   */
   public static AdditionalPropertiesArray fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesArray.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesArray to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesArray to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 5ac973bd7910..bec21f7dc5b1 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -63,10 +63,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesBoolean
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesBoolean
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesBoolean.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesBoolean given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesBoolean
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesBoolean
-  */
+  /**
+   * Create an instance of AdditionalPropertiesBoolean given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesBoolean
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesBoolean
+   */
   public static AdditionalPropertiesBoolean fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesBoolean.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesBoolean to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesBoolean to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 488b46c7fa58..58f785f25ae7 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
@@ -115,10 +115,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, String> getMapString() {
     return mapString;
@@ -142,10 +142,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -169,10 +169,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -196,10 +196,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -223,10 +223,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -250,10 +250,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -277,10 +277,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -304,10 +304,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -323,10 +323,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnytype1() {
     return anytype1;
@@ -342,10 +342,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnytype2() {
     return anytype2;
@@ -361,10 +361,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnytype3() {
     return anytype3;
@@ -456,12 +456,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -508,22 +508,22 @@ public AdditionalPropertiesClass read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesClass
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesClass
-  */
+  /**
+   * Create an instance of AdditionalPropertiesClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesClass
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesClass
+   */
   public static AdditionalPropertiesClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesClass.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 24c9c1dab0c5..b9c6648f3f71 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -63,10 +63,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesInteger
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesInteger
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesInteger.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesInteger given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesInteger
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesInteger
-  */
+  /**
+   * Create an instance of AdditionalPropertiesInteger given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesInteger
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesInteger
+   */
   public static AdditionalPropertiesInteger fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesInteger.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesInteger to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesInteger to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index a347327e6a14..358be4196113 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -64,10 +64,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesNumber
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesNumber
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesNumber.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -265,22 +265,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesNumber given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesNumber
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesNumber
-  */
+  /**
+   * Create an instance of AdditionalPropertiesNumber given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesNumber
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesNumber
+   */
   public static AdditionalPropertiesNumber fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesNumber.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesNumber to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesNumber to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 4e3b6fad50c9..9f7948eef7f0 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -64,10 +64,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesObject
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesObject
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesObject.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -265,22 +265,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesObject given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesObject
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesObject
-  */
+  /**
+   * Create an instance of AdditionalPropertiesObject given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesObject
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesObject
+   */
   public static AdditionalPropertiesObject fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesObject.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesObject to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesObject to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 573df50dd147..e51142db5a88 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -63,10 +63,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesString
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesString
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesString.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesString given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesString
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesString
-  */
+  /**
+   * Create an instance of AdditionalPropertiesString given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesString
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesString
+   */
   public static AdditionalPropertiesString fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesString.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesString to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesString to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java
index 11c01ed73f51..7b32fc9d6363 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Animal.java
@@ -68,10 +68,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -87,10 +87,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   public String getColor() {
     return color;
@@ -156,12 +156,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Animal
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Animal
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Animal.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -186,22 +186,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of Animal given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Animal
-  * @throws IOException if the JSON string is invalid with respect to Animal
-  */
+  /**
+   * Create an instance of Animal given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Animal
+   * @throws IOException if the JSON string is invalid with respect to Animal
+   */
   public static Animal fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Animal.class);
   }
 
- /**
-  * Convert an instance of Animal to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Animal to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 e9c9f46dfca4..44a1443bca4b 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
@@ -74,10 +74,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
@@ -139,12 +139,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfArrayOfNumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfArrayOfNumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfArrayOfNumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -195,22 +195,22 @@ public ArrayOfArrayOfNumberOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ArrayOfArrayOfNumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfArrayOfNumberOnly
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfArrayOfNumberOnly
-  */
+  /**
+   * Create an instance of ArrayOfArrayOfNumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfArrayOfNumberOnly
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfArrayOfNumberOnly
+   */
   public static ArrayOfArrayOfNumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfArrayOfNumberOnly.class);
   }
 
- /**
-  * Convert an instance of ArrayOfArrayOfNumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfArrayOfNumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 04acc855c8ba..214db5beec12 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
@@ -74,10 +74,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
@@ -139,12 +139,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfNumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfNumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfNumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -195,22 +195,22 @@ public ArrayOfNumberOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ArrayOfNumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfNumberOnly
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfNumberOnly
-  */
+  /**
+   * Create an instance of ArrayOfNumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfNumberOnly
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfNumberOnly
+   */
   public static ArrayOfNumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfNumberOnly.class);
   }
 
- /**
-  * Convert an instance of ArrayOfNumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfNumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 ad20f7916cc3..4e70c39850bb 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
@@ -82,10 +82,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -109,10 +109,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -136,10 +136,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
@@ -207,12 +207,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -271,22 +271,22 @@ public ArrayTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ArrayTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayTest
-  * @throws IOException if the JSON string is invalid with respect to ArrayTest
-  */
+  /**
+   * Create an instance of ArrayTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayTest
+   * @throws IOException if the JSON string is invalid with respect to ArrayTest
+   */
   public static ArrayTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayTest.class);
   }
 
- /**
-  * Convert an instance of ArrayTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java
index 4805c8b9d10f..082ee74ee0f9 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/BigCat.java
@@ -121,10 +121,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
   public KindEnum getKind() {
     return kind;
@@ -192,12 +192,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to BigCat
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to BigCat
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!BigCat.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -250,22 +250,22 @@ public BigCat read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of BigCat given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of BigCat
-  * @throws IOException if the JSON string is invalid with respect to BigCat
-  */
+  /**
+   * Create an instance of BigCat given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of BigCat
+   * @throws IOException if the JSON string is invalid with respect to BigCat
+   */
   public static BigCat fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, BigCat.class);
   }
 
- /**
-  * Convert an instance of BigCat to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of BigCat to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Capitalization.java
index 911f2f02e198..6e73225d1930 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -83,10 +83,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   public String getSmallCamel() {
     return smallCamel;
@@ -102,10 +102,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   public String getCapitalCamel() {
     return capitalCamel;
@@ -121,10 +121,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   public String getSmallSnake() {
     return smallSnake;
@@ -140,10 +140,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   public String getCapitalSnake() {
     return capitalSnake;
@@ -159,10 +159,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -178,10 +178,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   public String getATTNAME() {
     return ATT_NAME;
@@ -258,12 +258,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Capitalization
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Capitalization
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Capitalization.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -328,22 +328,22 @@ public Capitalization read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Capitalization given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Capitalization
-  * @throws IOException if the JSON string is invalid with respect to Capitalization
-  */
+  /**
+   * Create an instance of Capitalization given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Capitalization
+   * @throws IOException if the JSON string is invalid with respect to Capitalization
+   */
   public static Capitalization fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Capitalization.class);
   }
 
- /**
-  * Convert an instance of Capitalization to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Capitalization to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java
index 47aad2816df3..d4f859d96a5e 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Cat.java
@@ -65,10 +65,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getDeclawed() {
     return declawed;
@@ -135,12 +135,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Cat
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Cat
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Cat.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -159,22 +159,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of Cat given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Cat
-  * @throws IOException if the JSON string is invalid with respect to Cat
-  */
+  /**
+   * Create an instance of Cat given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Cat
+   * @throws IOException if the JSON string is invalid with respect to Cat
+   */
   public static Cat fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Cat.class);
   }
 
- /**
-  * Convert an instance of Cat to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Cat to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Category.java
index 3596e3706f7b..4b1d62cb690a 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -155,12 +155,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -217,22 +217,22 @@ public Category read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ClassModel.java
index 598d6e8f5125..014668b607d0 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -63,10 +63,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   public String getPropertyClass() {
     return propertyClass;
@@ -128,12 +128,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ClassModel
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ClassModel
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ClassModel.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -183,22 +183,22 @@ public ClassModel read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ClassModel given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ClassModel
-  * @throws IOException if the JSON string is invalid with respect to ClassModel
-  */
+  /**
+   * Create an instance of ClassModel given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ClassModel
+   * @throws IOException if the JSON string is invalid with respect to ClassModel
+   */
   public static ClassModel fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ClassModel.class);
   }
 
- /**
-  * Convert an instance of ClassModel to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ClassModel to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Client.java
index 279b74c612fd..2e7522a81bc6 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Client.java
@@ -63,10 +63,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   public String getClient() {
     return client;
@@ -128,12 +128,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Client
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Client
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Client.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -183,22 +183,22 @@ public Client read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Client given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Client
-  * @throws IOException if the JSON string is invalid with respect to Client
-  */
+  /**
+   * Create an instance of Client given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Client
+   * @throws IOException if the JSON string is invalid with respect to Client
+   */
   public static Client fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Client.class);
   }
 
- /**
-  * Convert an instance of Client to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Client to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Dog.java
index c462910f5a31..1ddc41dafc61 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Dog.java
@@ -65,10 +65,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   public String getBreed() {
     return breed;
@@ -135,12 +135,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Dog
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Dog
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Dog.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -193,22 +193,22 @@ public Dog read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Dog given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Dog
-  * @throws IOException if the JSON string is invalid with respect to Dog
-  */
+  /**
+   * Create an instance of Dog given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Dog
+   * @throws IOException if the JSON string is invalid with respect to Dog
+   */
   public static Dog fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Dog.class);
   }
 
- /**
-  * Convert an instance of Dog to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Dog to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 780b2bc7b183..23d594105ae8 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
@@ -173,10 +173,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -200,10 +200,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
@@ -268,12 +268,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EnumArrays
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EnumArrays
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EnumArrays.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -331,22 +331,22 @@ public EnumArrays read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of EnumArrays given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EnumArrays
-  * @throws IOException if the JSON string is invalid with respect to EnumArrays
-  */
+  /**
+   * Create an instance of EnumArrays given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EnumArrays
+   * @throws IOException if the JSON string is invalid with respect to EnumArrays
+   */
   public static EnumArrays fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EnumArrays.class);
   }
 
- /**
-  * Convert an instance of EnumArrays to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EnumArrays to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java
index eebd92e7a77a..ec4a14ebfcab 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -292,10 +292,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -311,10 +311,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -330,10 +330,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -349,10 +349,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -368,10 +368,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   public OuterEnum getOuterEnum() {
     return outerEnum;
@@ -446,12 +446,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("enum_string_required");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EnumTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EnumTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EnumTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -529,22 +529,22 @@ public EnumTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of EnumTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EnumTest
-  * @throws IOException if the JSON string is invalid with respect to EnumTest
-  */
+  /**
+   * Create an instance of EnumTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EnumTest
+   * @throws IOException if the JSON string is invalid with respect to EnumTest
+   */
   public static EnumTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EnumTest.class);
   }
 
- /**
-  * Convert an instance of EnumTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EnumTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 505fd92e74d3..864aab7928ae 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
@@ -70,10 +70,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   public ModelFile getFile() {
     return _file;
@@ -97,10 +97,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   public List<ModelFile> getFiles() {
     return files;
@@ -165,12 +165,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FileSchemaTestClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FileSchemaTestClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FileSchemaTestClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -235,22 +235,22 @@ public FileSchemaTestClass read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of FileSchemaTestClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FileSchemaTestClass
-  * @throws IOException if the JSON string is invalid with respect to FileSchemaTestClass
-  */
+  /**
+   * Create an instance of FileSchemaTestClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FileSchemaTestClass
+   * @throws IOException if the JSON string is invalid with respect to FileSchemaTestClass
+   */
   public static FileSchemaTestClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FileSchemaTestClass.class);
   }
 
- /**
-  * Convert an instance of FileSchemaTestClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FileSchemaTestClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java
index 7b6880b4f2aa..39b9609511cf 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -120,12 +120,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getInteger() {
     return integer;
@@ -141,12 +141,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getInt32() {
     return int32;
@@ -162,10 +162,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   public Long getInt64() {
     return int64;
@@ -181,12 +181,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getNumber() {
     return number;
@@ -202,12 +202,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   public Float getFloat() {
     return _float;
@@ -223,12 +223,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   public Double getDouble() {
     return _double;
@@ -244,10 +244,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   public String getString() {
     return string;
@@ -263,10 +263,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   public byte[] getByte() {
     return _byte;
@@ -282,10 +282,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   public File getBinary() {
     return binary;
@@ -301,10 +301,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   public LocalDate getDate() {
     return date;
@@ -320,10 +320,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -339,10 +339,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   public UUID getUuid() {
     return uuid;
@@ -358,10 +358,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   public String getPassword() {
     return password;
@@ -377,10 +377,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getBigDecimal() {
     return bigDecimal;
@@ -485,12 +485,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("password");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FormatTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FormatTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FormatTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -553,22 +553,22 @@ public FormatTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of FormatTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FormatTest
-  * @throws IOException if the JSON string is invalid with respect to FormatTest
-  */
+  /**
+   * Create an instance of FormatTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FormatTest
+   * @throws IOException if the JSON string is invalid with respect to FormatTest
+   */
   public static FormatTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FormatTest.class);
   }
 
- /**
-  * Convert an instance of FormatTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FormatTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 9e44aafe21f6..0d8c84969149 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -71,10 +71,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   public String getBar() {
     return bar;
@@ -82,10 +82,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   public String getFoo() {
     return foo;
@@ -147,12 +147,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to HasOnlyReadOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to HasOnlyReadOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!HasOnlyReadOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -205,22 +205,22 @@ public HasOnlyReadOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of HasOnlyReadOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of HasOnlyReadOnly
-  * @throws IOException if the JSON string is invalid with respect to HasOnlyReadOnly
-  */
+  /**
+   * Create an instance of HasOnlyReadOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of HasOnlyReadOnly
+   * @throws IOException if the JSON string is invalid with respect to HasOnlyReadOnly
+   */
   public static HasOnlyReadOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, HasOnlyReadOnly.class);
   }
 
- /**
-  * Convert an instance of HasOnlyReadOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of HasOnlyReadOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 82741dab0720..b452cb027b08 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
@@ -137,10 +137,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -164,10 +164,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -191,10 +191,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -218,10 +218,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
@@ -292,12 +292,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to MapTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to MapTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!MapTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -344,22 +344,22 @@ public MapTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of MapTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of MapTest
-  * @throws IOException if the JSON string is invalid with respect to MapTest
-  */
+  /**
+   * Create an instance of MapTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of MapTest
+   * @throws IOException if the JSON string is invalid with respect to MapTest
+   */
   public static MapTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, MapTest.class);
   }
 
- /**
-  * Convert an instance of MapTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of MapTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 2ed185103f67..266ce6914f35 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
@@ -76,10 +76,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   public UUID getUuid() {
     return uuid;
@@ -95,10 +95,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -122,10 +122,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Animal> getMap() {
     return map;
@@ -193,12 +193,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!MixedPropertiesAndAdditionalPropertiesClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -248,22 +248,22 @@ public MixedPropertiesAndAdditionalPropertiesClass read(JsonReader in) throws IO
     }
   }
 
- /**
-  * Create an instance of MixedPropertiesAndAdditionalPropertiesClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of MixedPropertiesAndAdditionalPropertiesClass
-  * @throws IOException if the JSON string is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
-  */
+  /**
+   * Create an instance of MixedPropertiesAndAdditionalPropertiesClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of MixedPropertiesAndAdditionalPropertiesClass
+   * @throws IOException if the JSON string is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
+   */
   public static MixedPropertiesAndAdditionalPropertiesClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, MixedPropertiesAndAdditionalPropertiesClass.class);
   }
 
- /**
-  * Convert an instance of MixedPropertiesAndAdditionalPropertiesClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of MixedPropertiesAndAdditionalPropertiesClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Model200Response.java
index 75856d731641..6f40e1c1c191 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -67,10 +67,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getName() {
     return name;
@@ -86,10 +86,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   public String getPropertyClass() {
     return propertyClass;
@@ -154,12 +154,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Model200Response
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Model200Response
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Model200Response.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -209,22 +209,22 @@ public Model200Response read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Model200Response given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Model200Response
-  * @throws IOException if the JSON string is invalid with respect to Model200Response
-  */
+  /**
+   * Create an instance of Model200Response given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Model200Response
+   * @throws IOException if the JSON string is invalid with respect to Model200Response
+   */
   public static Model200Response fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Model200Response.class);
   }
 
- /**
-  * Convert an instance of Model200Response to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Model200Response to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6f7dca456f72..e0c58a226797 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -71,10 +71,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -90,10 +90,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -180,12 +180,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -238,22 +238,22 @@ public ModelApiResponse read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelFile.java
index f7ab0854d4f0..1a9e735099a2 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -63,10 +63,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   public String getSourceURI() {
     return sourceURI;
@@ -128,12 +128,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelFile
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelFile
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelFile.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -183,22 +183,22 @@ public ModelFile read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelFile given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelFile
-  * @throws IOException if the JSON string is invalid with respect to ModelFile
-  */
+  /**
+   * Create an instance of ModelFile given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelFile
+   * @throws IOException if the JSON string is invalid with respect to ModelFile
+   */
   public static ModelFile fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelFile.class);
   }
 
- /**
-  * Convert an instance of ModelFile to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelFile to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelList.java
index ec7d70354dcf..c3f578317a43 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelList.java
@@ -63,10 +63,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   public String get123list() {
     return _123list;
@@ -128,12 +128,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelList
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelList
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelList.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -183,22 +183,22 @@ public ModelList read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelList given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelList
-  * @throws IOException if the JSON string is invalid with respect to ModelList
-  */
+  /**
+   * Create an instance of ModelList given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelList
+   * @throws IOException if the JSON string is invalid with respect to ModelList
+   */
   public static ModelList fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelList.class);
   }
 
- /**
-  * Convert an instance of ModelList to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelList to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelReturn.java
index 90b87307494c..020866cbb70b 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -63,10 +63,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getReturn() {
     return _return;
@@ -128,12 +128,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelReturn
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelReturn
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelReturn.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -180,22 +180,22 @@ public ModelReturn read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelReturn given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelReturn
-  * @throws IOException if the JSON string is invalid with respect to ModelReturn
-  */
+  /**
+   * Create an instance of ModelReturn given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelReturn
+   * @throws IOException if the JSON string is invalid with respect to ModelReturn
+   */
   public static ModelReturn fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelReturn.class);
   }
 
- /**
-  * Convert an instance of ModelReturn to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelReturn to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Name.java
index 2dd4b93bba0f..735865162b21 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Name.java
@@ -84,10 +84,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public Integer getName() {
     return name;
@@ -98,10 +98,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getSnakeCase() {
     return snakeCase;
@@ -114,10 +114,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   public String getProperty() {
     return property;
@@ -128,10 +128,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   public Integer get123number() {
     return _123number;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Name
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Name
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Name.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -262,22 +262,22 @@ public Name read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Name given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Name
-  * @throws IOException if the JSON string is invalid with respect to Name
-  */
+  /**
+   * Create an instance of Name given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Name
+   * @throws IOException if the JSON string is invalid with respect to Name
+   */
   public static Name fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Name.class);
   }
 
- /**
-  * Convert an instance of Name to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Name to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/NumberOnly.java
index 58b6fedae80b..227fb2e3514e 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -64,10 +64,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getJustNumber() {
     return justNumber;
@@ -129,12 +129,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -181,22 +181,22 @@ public NumberOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of NumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NumberOnly
-  * @throws IOException if the JSON string is invalid with respect to NumberOnly
-  */
+  /**
+   * Create an instance of NumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NumberOnly
+   * @throws IOException if the JSON string is invalid with respect to NumberOnly
+   */
   public static NumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NumberOnly.class);
   }
 
- /**
-  * Convert an instance of NumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java
index f10654523bda..0aaa4cc9099f 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Order.java
@@ -138,10 +138,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -157,10 +157,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -176,10 +176,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -195,10 +195,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -313,12 +313,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -372,22 +372,22 @@ public Order read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterComposite.java
index c2fbb50eda79..3871c2c68402 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -72,10 +72,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -91,10 +91,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   public String getMyString() {
     return myString;
@@ -110,10 +110,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getMyBoolean() {
     return myBoolean;
@@ -181,12 +181,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to OuterComposite
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to OuterComposite
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!OuterComposite.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -236,22 +236,22 @@ public OuterComposite read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of OuterComposite given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of OuterComposite
-  * @throws IOException if the JSON string is invalid with respect to OuterComposite
-  */
+  /**
+   * Create an instance of OuterComposite given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of OuterComposite
+   * @throws IOException if the JSON string is invalid with respect to OuterComposite
+   */
   public static OuterComposite fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, OuterComposite.class);
   }
 
- /**
-  * Convert an instance of OuterComposite to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of OuterComposite to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 ab4ecb422209..32e22f377d77 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
@@ -143,10 +143,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -162,10 +162,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -181,10 +181,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -208,10 +208,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public Set<String> getPhotoUrls() {
     return photoUrls;
@@ -235,10 +235,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -254,10 +254,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -336,12 +336,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -429,22 +429,22 @@ public Pet read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index fc86546fbcee..c4460bb6dfe2 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -69,10 +69,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   public String getBar() {
     return bar;
@@ -85,10 +85,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   public String getBaz() {
     return baz;
@@ -153,12 +153,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ReadOnlyFirst
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ReadOnlyFirst
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ReadOnlyFirst.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -211,22 +211,22 @@ public ReadOnlyFirst read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ReadOnlyFirst given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ReadOnlyFirst
-  * @throws IOException if the JSON string is invalid with respect to ReadOnlyFirst
-  */
+  /**
+   * Create an instance of ReadOnlyFirst given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ReadOnlyFirst
+   * @throws IOException if the JSON string is invalid with respect to ReadOnlyFirst
+   */
   public static ReadOnlyFirst fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ReadOnlyFirst.class);
   }
 
- /**
-  * Convert an instance of ReadOnlyFirst to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ReadOnlyFirst to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 24c9fb4156cd..3839bf48d86f 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -63,10 +63,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
@@ -128,12 +128,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to SpecialModelName
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to SpecialModelName
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!SpecialModelName.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -180,22 +180,22 @@ public SpecialModelName read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of SpecialModelName given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of SpecialModelName
-  * @throws IOException if the JSON string is invalid with respect to SpecialModelName
-  */
+  /**
+   * Create an instance of SpecialModelName given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of SpecialModelName
+   * @throws IOException if the JSON string is invalid with respect to SpecialModelName
+   */
   public static SpecialModelName fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, SpecialModelName.class);
   }
 
- /**
-  * Convert an instance of SpecialModelName to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of SpecialModelName to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Tag.java
index 9a499f2af36b..bef05e8d4a8e 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -154,12 +154,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -209,22 +209,22 @@ public Tag read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 24d068b3233b..6fbe54e82be9 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -82,10 +82,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   public String getStringItem() {
     return stringItem;
@@ -101,10 +101,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -120,10 +120,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Integer getIntegerItem() {
     return integerItem;
@@ -139,10 +139,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Boolean getBoolItem() {
     return boolItem;
@@ -166,10 +166,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   public List<Integer> getArrayItem() {
     return arrayItem;
@@ -248,12 +248,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("array_item");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TypeHolderDefault
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TypeHolderDefault
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TypeHolderDefault.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -316,22 +316,22 @@ public TypeHolderDefault read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of TypeHolderDefault given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TypeHolderDefault
-  * @throws IOException if the JSON string is invalid with respect to TypeHolderDefault
-  */
+  /**
+   * Create an instance of TypeHolderDefault given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TypeHolderDefault
+   * @throws IOException if the JSON string is invalid with respect to TypeHolderDefault
+   */
   public static TypeHolderDefault fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TypeHolderDefault.class);
   }
 
- /**
-  * Convert an instance of TypeHolderDefault to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TypeHolderDefault to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d13245433e56..5ef3d57f7664 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -86,10 +86,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   public String getStringItem() {
     return stringItem;
@@ -105,10 +105,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -124,10 +124,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Float getFloatItem() {
     return floatItem;
@@ -143,10 +143,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Integer getIntegerItem() {
     return integerItem;
@@ -162,10 +162,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Boolean getBoolItem() {
     return boolItem;
@@ -189,10 +189,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   public List<Integer> getArrayItem() {
     return arrayItem;
@@ -275,12 +275,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("array_item");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TypeHolderExample
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TypeHolderExample
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TypeHolderExample.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -343,22 +343,22 @@ public TypeHolderExample read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of TypeHolderExample given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TypeHolderExample
-  * @throws IOException if the JSON string is invalid with respect to TypeHolderExample
-  */
+  /**
+   * Create an instance of TypeHolderExample given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TypeHolderExample
+   * @throws IOException if the JSON string is invalid with respect to TypeHolderExample
+   */
   public static TypeHolderExample fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TypeHolderExample.class);
   }
 
- /**
-  * Convert an instance of TypeHolderExample to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TypeHolderExample to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/User.java
index 2e7801f6986a..24c92c675df7 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/User.java
@@ -91,10 +91,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -129,10 +129,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -167,10 +167,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -186,10 +186,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -205,10 +205,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -224,10 +224,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -310,12 +310,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -380,22 +380,22 @@ public User read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 4f6e7c1c6693..e7c723352f24 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
@@ -178,10 +178,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
   public String getAttributeString() {
     return attributeString;
@@ -197,10 +197,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -216,10 +216,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -235,10 +235,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -262,10 +262,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -281,10 +281,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
   public String getNameString() {
     return nameString;
@@ -300,10 +300,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -319,10 +319,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getNameInteger() {
     return nameInteger;
@@ -338,10 +338,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -365,10 +365,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNameArray() {
     return nameArray;
@@ -392,10 +392,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -411,10 +411,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
   public String getPrefixString() {
     return prefixString;
@@ -430,10 +430,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -449,10 +449,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -468,10 +468,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -495,10 +495,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -522,10 +522,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -541,10 +541,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
   public String getNamespaceString() {
     return namespaceString;
@@ -560,10 +560,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -579,10 +579,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -598,10 +598,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -625,10 +625,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -652,10 +652,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -671,10 +671,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
   public String getPrefixNsString() {
     return prefixNsString;
@@ -690,10 +690,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -709,10 +709,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -728,10 +728,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -755,10 +755,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -782,10 +782,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
@@ -931,12 +931,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to XmlItem
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to XmlItem
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!XmlItem.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -1034,22 +1034,22 @@ public XmlItem read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of XmlItem given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of XmlItem
-  * @throws IOException if the JSON string is invalid with respect to XmlItem
-  */
+  /**
+   * Create an instance of XmlItem given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of XmlItem
+   * @throws IOException if the JSON string is invalid with respect to XmlItem
+   */
   public static XmlItem fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, XmlItem.class);
   }
 
- /**
-  * Convert an instance of XmlItem to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of XmlItem to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java
index d44eef955c1d..88be2276920f 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 4ea1bf010a49..4c14d2d89b8d 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -71,10 +71,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -90,10 +90,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -226,12 +226,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -319,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
index 42e5eb284a66..bd8d219dcc74 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java
@@ -138,10 +138,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -157,10 +157,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -176,10 +176,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -195,10 +195,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -359,12 +359,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -453,22 +453,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 d841f322fda1..71e425deb930 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
@@ -142,10 +142,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -161,10 +161,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -180,10 +180,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -207,10 +207,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -234,10 +234,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -254,11 +254,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
@@ -385,12 +385,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -513,22 +513,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java
index 01f321916d54..3e04f184a3d6 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java
index d3c9d69da4bb..68c8321d11bc 100644
--- a/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java
@@ -91,10 +91,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -129,10 +129,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -167,10 +167,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -186,10 +186,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -205,10 +205,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -224,10 +224,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -356,12 +356,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -461,22 +461,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Category.java
index d44eef955c1d..88be2276920f 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 4ea1bf010a49..4c14d2d89b8d 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -71,10 +71,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -90,10 +90,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -226,12 +226,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -319,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java
index 42e5eb284a66..bd8d219dcc74 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Order.java
@@ -138,10 +138,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -157,10 +157,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -176,10 +176,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -195,10 +195,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -359,12 +359,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -453,22 +453,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java
index d841f322fda1..71e425deb930 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Pet.java
@@ -142,10 +142,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -161,10 +161,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -180,10 +180,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -207,10 +207,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -234,10 +234,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -254,11 +254,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
@@ -385,12 +385,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -513,22 +513,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java
index a2af2ba9750f..efa119dd23ae 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases1.java
@@ -143,10 +143,10 @@ public PetWithRequiredNullableCases1 id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -162,10 +162,10 @@ public PetWithRequiredNullableCases1 category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -181,10 +181,10 @@ public PetWithRequiredNullableCases1 name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -208,10 +208,10 @@ public PetWithRequiredNullableCases1 addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -235,10 +235,10 @@ public PetWithRequiredNullableCases1 addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -255,11 +255,11 @@ public PetWithRequiredNullableCases1 status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
@@ -397,12 +397,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to PetWithRequiredNullableCases1
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to PetWithRequiredNullableCases1
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!PetWithRequiredNullableCases1.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -525,22 +525,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of PetWithRequiredNullableCases1 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of PetWithRequiredNullableCases1
-  * @throws IOException if the JSON string is invalid with respect to PetWithRequiredNullableCases1
-  */
+  /**
+   * Create an instance of PetWithRequiredNullableCases1 given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of PetWithRequiredNullableCases1
+   * @throws IOException if the JSON string is invalid with respect to PetWithRequiredNullableCases1
+   */
   public static PetWithRequiredNullableCases1 fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, PetWithRequiredNullableCases1.class);
   }
 
- /**
-  * Convert an instance of PetWithRequiredNullableCases1 to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of PetWithRequiredNullableCases1 to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java
index a236e1af033f..7d2ee7a697ae 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/PetWithRequiredNullableCases2.java
@@ -142,10 +142,10 @@ public PetWithRequiredNullableCases2 id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -161,10 +161,10 @@ public PetWithRequiredNullableCases2 category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -180,10 +180,10 @@ public PetWithRequiredNullableCases2 name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -207,10 +207,10 @@ public PetWithRequiredNullableCases2 addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -234,10 +234,10 @@ public PetWithRequiredNullableCases2 addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -254,11 +254,11 @@ public PetWithRequiredNullableCases2 status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
@@ -385,12 +385,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to PetWithRequiredNullableCases2
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to PetWithRequiredNullableCases2
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!PetWithRequiredNullableCases2.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -513,22 +513,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of PetWithRequiredNullableCases2 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of PetWithRequiredNullableCases2
-  * @throws IOException if the JSON string is invalid with respect to PetWithRequiredNullableCases2
-  */
+  /**
+   * Create an instance of PetWithRequiredNullableCases2 given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of PetWithRequiredNullableCases2
+   * @throws IOException if the JSON string is invalid with respect to PetWithRequiredNullableCases2
+   */
   public static PetWithRequiredNullableCases2 fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, PetWithRequiredNullableCases2.class);
   }
 
- /**
-  * Convert an instance of PetWithRequiredNullableCases2 to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of PetWithRequiredNullableCases2 to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Tag.java
index 01f321916d54..3e04f184a3d6 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/User.java
index d3c9d69da4bb..68c8321d11bc 100644
--- a/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-nullable-required/src/main/java/org/openapitools/client/model/User.java
@@ -91,10 +91,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -129,10 +129,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -148,10 +148,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -167,10 +167,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -186,10 +186,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -205,10 +205,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -224,10 +224,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -356,12 +356,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -461,22 +461,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 6ba77362255d..4189b0bfc91e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -65,10 +65,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -197,12 +197,12 @@ public AdditionalPropertiesAnyType[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesAnyType
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesAnyType
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesAnyType.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -287,22 +287,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesAnyType given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesAnyType
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesAnyType
-  */
+  /**
+   * Create an instance of AdditionalPropertiesAnyType given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesAnyType
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesAnyType
+   */
   public static AdditionalPropertiesAnyType fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesAnyType.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesAnyType to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesAnyType to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index fec097d04ee8..82647af34528 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -66,10 +66,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -198,12 +198,12 @@ public AdditionalPropertiesArray[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesArray
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesArray
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesArray.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -288,22 +288,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesArray given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesArray
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesArray
-  */
+  /**
+   * Create an instance of AdditionalPropertiesArray given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesArray
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesArray
+   */
   public static AdditionalPropertiesArray fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesArray.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesArray to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesArray to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 7a754fe5c598..7a6aec572ed9 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -65,10 +65,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -197,12 +197,12 @@ public AdditionalPropertiesBoolean[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesBoolean
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesBoolean
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesBoolean.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -287,22 +287,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesBoolean given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesBoolean
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesBoolean
-  */
+  /**
+   * Create an instance of AdditionalPropertiesBoolean given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesBoolean
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesBoolean
+   */
   public static AdditionalPropertiesBoolean fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesBoolean.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesBoolean to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesBoolean to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 6425d484650d..1f2420b9571b 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
@@ -117,10 +117,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, String> getMapString() {
     return mapString;
@@ -144,10 +144,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -171,10 +171,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -198,10 +198,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -225,10 +225,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -252,10 +252,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -279,10 +279,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -306,10 +306,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -325,10 +325,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnytype1() {
     return anytype1;
@@ -344,10 +344,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnytype2() {
     return anytype2;
@@ -363,10 +363,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnytype3() {
     return anytype3;
@@ -499,12 +499,12 @@ public AdditionalPropertiesClass[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -551,22 +551,22 @@ public AdditionalPropertiesClass read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesClass
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesClass
-  */
+  /**
+   * Create an instance of AdditionalPropertiesClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesClass
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesClass
+   */
   public static AdditionalPropertiesClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesClass.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1332a9a57b98..cf8cca1b57a5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -65,10 +65,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -197,12 +197,12 @@ public AdditionalPropertiesInteger[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesInteger
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesInteger
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesInteger.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -287,22 +287,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesInteger given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesInteger
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesInteger
-  */
+  /**
+   * Create an instance of AdditionalPropertiesInteger given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesInteger
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesInteger
+   */
   public static AdditionalPropertiesInteger fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesInteger.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesInteger to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesInteger to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 2b689473d467..ab53b61ad6d6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -66,10 +66,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -198,12 +198,12 @@ public AdditionalPropertiesNumber[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesNumber
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesNumber
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesNumber.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -288,22 +288,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesNumber given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesNumber
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesNumber
-  */
+  /**
+   * Create an instance of AdditionalPropertiesNumber given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesNumber
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesNumber
+   */
   public static AdditionalPropertiesNumber fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesNumber.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesNumber to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesNumber to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 99ba2bce20d5..ee11b833eeba 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -66,10 +66,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -198,12 +198,12 @@ public AdditionalPropertiesObject[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesObject
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesObject
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesObject.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -288,22 +288,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesObject given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesObject
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesObject
-  */
+  /**
+   * Create an instance of AdditionalPropertiesObject given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesObject
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesObject
+   */
   public static AdditionalPropertiesObject fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesObject.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesObject to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesObject to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index d66a78c1fdca..918532d27ff9 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -65,10 +65,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -197,12 +197,12 @@ public AdditionalPropertiesString[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesString
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesString
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesString.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -287,22 +287,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesString given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesString
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesString
-  */
+  /**
+   * Create an instance of AdditionalPropertiesString given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesString
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesString
+   */
   public static AdditionalPropertiesString fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesString.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesString to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesString to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
index fb054336f872..5c0fb78a2e61 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
@@ -70,10 +70,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -89,10 +89,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   public String getColor() {
     return color;
@@ -181,12 +181,12 @@ public Animal[] newArray(int size) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Animal
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Animal
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Animal.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -211,22 +211,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of Animal given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Animal
-  * @throws IOException if the JSON string is invalid with respect to Animal
-  */
+  /**
+   * Create an instance of Animal given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Animal
+   * @throws IOException if the JSON string is invalid with respect to Animal
+   */
   public static Animal fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Animal.class);
   }
 
- /**
-  * Convert an instance of Animal to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Animal to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 46acffee9689..85cbc7ee00d1 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
@@ -76,10 +76,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
@@ -162,12 +162,12 @@ public ArrayOfArrayOfNumberOnly[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfArrayOfNumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfArrayOfNumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfArrayOfNumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -218,22 +218,22 @@ public ArrayOfArrayOfNumberOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ArrayOfArrayOfNumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfArrayOfNumberOnly
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfArrayOfNumberOnly
-  */
+  /**
+   * Create an instance of ArrayOfArrayOfNumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfArrayOfNumberOnly
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfArrayOfNumberOnly
+   */
   public static ArrayOfArrayOfNumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfArrayOfNumberOnly.class);
   }
 
- /**
-  * Convert an instance of ArrayOfArrayOfNumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfArrayOfNumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 4cd8394ce4cf..82d22a3a1365 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
@@ -76,10 +76,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
@@ -162,12 +162,12 @@ public ArrayOfNumberOnly[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfNumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfNumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfNumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -218,22 +218,22 @@ public ArrayOfNumberOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ArrayOfNumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfNumberOnly
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfNumberOnly
-  */
+  /**
+   * Create an instance of ArrayOfNumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfNumberOnly
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfNumberOnly
+   */
   public static ArrayOfNumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfNumberOnly.class);
   }
 
- /**
-  * Convert an instance of ArrayOfNumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfNumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 e6e71a7880d0..a6ee476dd0d4 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
@@ -84,10 +84,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -111,10 +111,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -138,10 +138,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
@@ -234,12 +234,12 @@ public ArrayTest[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -298,22 +298,22 @@ public ArrayTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ArrayTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayTest
-  * @throws IOException if the JSON string is invalid with respect to ArrayTest
-  */
+  /**
+   * Create an instance of ArrayTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayTest
+   * @throws IOException if the JSON string is invalid with respect to ArrayTest
+   */
   public static ArrayTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayTest.class);
   }
 
- /**
-  * Convert an instance of ArrayTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
index 8673287af957..1fd4dce6b676 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/BigCat.java
@@ -124,10 +124,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
   public KindEnum getKind() {
     return kind;
@@ -218,12 +218,12 @@ public BigCat[] newArray(int size) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to BigCat
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to BigCat
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!BigCat.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -276,22 +276,22 @@ public BigCat read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of BigCat given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of BigCat
-  * @throws IOException if the JSON string is invalid with respect to BigCat
-  */
+  /**
+   * Create an instance of BigCat given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of BigCat
+   * @throws IOException if the JSON string is invalid with respect to BigCat
+   */
   public static BigCat fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, BigCat.class);
   }
 
- /**
-  * Convert an instance of BigCat to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of BigCat to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
index 39875e5ea6bf..6064c9946eb6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -85,10 +85,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   public String getSmallCamel() {
     return smallCamel;
@@ -104,10 +104,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   public String getCapitalCamel() {
     return capitalCamel;
@@ -123,10 +123,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   public String getSmallSnake() {
     return smallSnake;
@@ -142,10 +142,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   public String getCapitalSnake() {
     return capitalSnake;
@@ -161,10 +161,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -180,10 +180,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   public String getATTNAME() {
     return ATT_NAME;
@@ -291,12 +291,12 @@ public Capitalization[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Capitalization
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Capitalization
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Capitalization.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -361,22 +361,22 @@ public Capitalization read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Capitalization given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Capitalization
-  * @throws IOException if the JSON string is invalid with respect to Capitalization
-  */
+  /**
+   * Create an instance of Capitalization given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Capitalization
+   * @throws IOException if the JSON string is invalid with respect to Capitalization
+   */
   public static Capitalization fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Capitalization.class);
   }
 
- /**
-  * Convert an instance of Capitalization to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Capitalization to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
index a58bd2da902e..44cbb2cc895b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
@@ -68,10 +68,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getDeclawed() {
     return declawed;
@@ -161,12 +161,12 @@ public Cat[] newArray(int size) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Cat
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Cat
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Cat.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -185,22 +185,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of Cat given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Cat
-  * @throws IOException if the JSON string is invalid with respect to Cat
-  */
+  /**
+   * Create an instance of Cat given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Cat
+   * @throws IOException if the JSON string is invalid with respect to Cat
+   */
   public static Cat fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Cat.class);
   }
 
- /**
-  * Convert an instance of Cat to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Cat to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
index ec289727c081..c46c05a72e69 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
@@ -69,10 +69,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -88,10 +88,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -180,12 +180,12 @@ public Category[] newArray(int size) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -242,22 +242,22 @@ public Category read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
index 3a5efa56031e..aa5c2ff7fbe1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -65,10 +65,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   public String getPropertyClass() {
     return propertyClass;
@@ -151,12 +151,12 @@ public ClassModel[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ClassModel
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ClassModel
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ClassModel.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -206,22 +206,22 @@ public ClassModel read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ClassModel given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ClassModel
-  * @throws IOException if the JSON string is invalid with respect to ClassModel
-  */
+  /**
+   * Create an instance of ClassModel given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ClassModel
+   * @throws IOException if the JSON string is invalid with respect to ClassModel
+   */
   public static ClassModel fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ClassModel.class);
   }
 
- /**
-  * Convert an instance of ClassModel to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ClassModel to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
index 3bc29616b75a..917c79d81653 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
@@ -65,10 +65,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   public String getClient() {
     return client;
@@ -151,12 +151,12 @@ public Client[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Client
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Client
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Client.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -206,22 +206,22 @@ public Client read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Client given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Client
-  * @throws IOException if the JSON string is invalid with respect to Client
-  */
+  /**
+   * Create an instance of Client given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Client
+   * @throws IOException if the JSON string is invalid with respect to Client
+   */
   public static Client fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Client.class);
   }
 
- /**
-  * Convert an instance of Client to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Client to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
index 6b1b8d10284b..de609eeaa18b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
@@ -68,10 +68,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   public String getBreed() {
     return breed;
@@ -161,12 +161,12 @@ public Dog[] newArray(int size) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Dog
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Dog
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Dog.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -219,22 +219,22 @@ public Dog read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Dog given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Dog
-  * @throws IOException if the JSON string is invalid with respect to Dog
-  */
+  /**
+   * Create an instance of Dog given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Dog
+   * @throws IOException if the JSON string is invalid with respect to Dog
+   */
   public static Dog fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Dog.class);
   }
 
- /**
-  * Convert an instance of Dog to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Dog to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 546d3cdbce7f..a2c83e4c4153 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
@@ -175,10 +175,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -202,10 +202,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
@@ -293,12 +293,12 @@ public EnumArrays[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EnumArrays
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EnumArrays
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EnumArrays.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -356,22 +356,22 @@ public EnumArrays read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of EnumArrays given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EnumArrays
-  * @throws IOException if the JSON string is invalid with respect to EnumArrays
-  */
+  /**
+   * Create an instance of EnumArrays given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EnumArrays
+   * @throws IOException if the JSON string is invalid with respect to EnumArrays
+   */
   public static EnumArrays fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EnumArrays.class);
   }
 
- /**
-  * Convert an instance of EnumArrays to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EnumArrays to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
index 7c4b27fbfc39..8fa98c633d87 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -294,10 +294,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -313,10 +313,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -332,10 +332,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -351,10 +351,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -370,10 +370,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   public OuterEnum getOuterEnum() {
     return outerEnum;
@@ -477,12 +477,12 @@ public EnumTest[] newArray(int size) {
     openapiRequiredFields.add("enum_string_required");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EnumTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EnumTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EnumTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -560,22 +560,22 @@ public EnumTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of EnumTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EnumTest
-  * @throws IOException if the JSON string is invalid with respect to EnumTest
-  */
+  /**
+   * Create an instance of EnumTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EnumTest
+   * @throws IOException if the JSON string is invalid with respect to EnumTest
+   */
   public static EnumTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EnumTest.class);
   }
 
- /**
-  * Convert an instance of EnumTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EnumTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 583fd6c45e71..541a5eb4c81f 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
@@ -72,10 +72,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   public ModelFile getFile() {
     return _file;
@@ -99,10 +99,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   public List<ModelFile> getFiles() {
     return files;
@@ -190,12 +190,12 @@ public FileSchemaTestClass[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FileSchemaTestClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FileSchemaTestClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FileSchemaTestClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -260,22 +260,22 @@ public FileSchemaTestClass read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of FileSchemaTestClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FileSchemaTestClass
-  * @throws IOException if the JSON string is invalid with respect to FileSchemaTestClass
-  */
+  /**
+   * Create an instance of FileSchemaTestClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FileSchemaTestClass
+   * @throws IOException if the JSON string is invalid with respect to FileSchemaTestClass
+   */
   public static FileSchemaTestClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FileSchemaTestClass.class);
   }
 
- /**
-  * Convert an instance of FileSchemaTestClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FileSchemaTestClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
index 06fe0d7a95d0..73533eea10a2 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -122,12 +122,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getInteger() {
     return integer;
@@ -143,12 +143,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getInt32() {
     return int32;
@@ -164,10 +164,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   public Long getInt64() {
     return int64;
@@ -183,12 +183,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getNumber() {
     return number;
@@ -204,12 +204,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   public Float getFloat() {
     return _float;
@@ -225,12 +225,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   public Double getDouble() {
     return _double;
@@ -246,10 +246,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   public String getString() {
     return string;
@@ -265,10 +265,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   public byte[] getByte() {
     return _byte;
@@ -284,10 +284,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   public File getBinary() {
     return binary;
@@ -303,10 +303,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   public LocalDate getDate() {
     return date;
@@ -322,10 +322,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -341,10 +341,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   public UUID getUuid() {
     return uuid;
@@ -360,10 +360,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   public String getPassword() {
     return password;
@@ -379,10 +379,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getBigDecimal() {
     return bigDecimal;
@@ -534,12 +534,12 @@ public FormatTest[] newArray(int size) {
     openapiRequiredFields.add("password");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FormatTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FormatTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FormatTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -602,22 +602,22 @@ public FormatTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of FormatTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FormatTest
-  * @throws IOException if the JSON string is invalid with respect to FormatTest
-  */
+  /**
+   * Create an instance of FormatTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FormatTest
+   * @throws IOException if the JSON string is invalid with respect to FormatTest
+   */
   public static FormatTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FormatTest.class);
   }
 
- /**
-  * Convert an instance of FormatTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FormatTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index ce425f992872..32b88cc8f9b4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -73,10 +73,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   public String getBar() {
     return bar;
@@ -84,10 +84,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   public String getFoo() {
     return foo;
@@ -172,12 +172,12 @@ public HasOnlyReadOnly[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to HasOnlyReadOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to HasOnlyReadOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!HasOnlyReadOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -230,22 +230,22 @@ public HasOnlyReadOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of HasOnlyReadOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of HasOnlyReadOnly
-  * @throws IOException if the JSON string is invalid with respect to HasOnlyReadOnly
-  */
+  /**
+   * Create an instance of HasOnlyReadOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of HasOnlyReadOnly
+   * @throws IOException if the JSON string is invalid with respect to HasOnlyReadOnly
+   */
   public static HasOnlyReadOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, HasOnlyReadOnly.class);
   }
 
- /**
-  * Convert an instance of HasOnlyReadOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of HasOnlyReadOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 34224138c1ef..27a663371305 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
@@ -139,10 +139,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -166,10 +166,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -193,10 +193,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -220,10 +220,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
@@ -321,12 +321,12 @@ public MapTest[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to MapTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to MapTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!MapTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -373,22 +373,22 @@ public MapTest read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of MapTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of MapTest
-  * @throws IOException if the JSON string is invalid with respect to MapTest
-  */
+  /**
+   * Create an instance of MapTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of MapTest
+   * @throws IOException if the JSON string is invalid with respect to MapTest
+   */
   public static MapTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, MapTest.class);
   }
 
- /**
-  * Convert an instance of MapTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of MapTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 5e02b9a63377..729296cb4813 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
@@ -78,10 +78,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   public UUID getUuid() {
     return uuid;
@@ -97,10 +97,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -124,10 +124,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Animal> getMap() {
     return map;
@@ -220,12 +220,12 @@ public MixedPropertiesAndAdditionalPropertiesClass[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!MixedPropertiesAndAdditionalPropertiesClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -275,22 +275,22 @@ public MixedPropertiesAndAdditionalPropertiesClass read(JsonReader in) throws IO
     }
   }
 
- /**
-  * Create an instance of MixedPropertiesAndAdditionalPropertiesClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of MixedPropertiesAndAdditionalPropertiesClass
-  * @throws IOException if the JSON string is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
-  */
+  /**
+   * Create an instance of MixedPropertiesAndAdditionalPropertiesClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of MixedPropertiesAndAdditionalPropertiesClass
+   * @throws IOException if the JSON string is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
+   */
   public static MixedPropertiesAndAdditionalPropertiesClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, MixedPropertiesAndAdditionalPropertiesClass.class);
   }
 
- /**
-  * Convert an instance of MixedPropertiesAndAdditionalPropertiesClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of MixedPropertiesAndAdditionalPropertiesClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
index 3cd79927c640..fa4eacbcdc11 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -69,10 +69,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getName() {
     return name;
@@ -88,10 +88,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   public String getPropertyClass() {
     return propertyClass;
@@ -179,12 +179,12 @@ public Model200Response[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Model200Response
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Model200Response
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Model200Response.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -234,22 +234,22 @@ public Model200Response read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Model200Response given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Model200Response
-  * @throws IOException if the JSON string is invalid with respect to Model200Response
-  */
+  /**
+   * Create an instance of Model200Response given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Model200Response
+   * @throws IOException if the JSON string is invalid with respect to Model200Response
+   */
   public static Model200Response fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Model200Response.class);
   }
 
- /**
-  * Convert an instance of Model200Response to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Model200Response to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index dd530a242a35..b2e64b6acaab 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -73,10 +73,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -92,10 +92,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -111,10 +111,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -207,12 +207,12 @@ public ModelApiResponse[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -265,22 +265,22 @@ public ModelApiResponse read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelFile.java
index f413247d6402..67749eb45f69 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -65,10 +65,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   public String getSourceURI() {
     return sourceURI;
@@ -151,12 +151,12 @@ public ModelFile[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelFile
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelFile
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelFile.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -206,22 +206,22 @@ public ModelFile read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelFile given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelFile
-  * @throws IOException if the JSON string is invalid with respect to ModelFile
-  */
+  /**
+   * Create an instance of ModelFile given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelFile
+   * @throws IOException if the JSON string is invalid with respect to ModelFile
+   */
   public static ModelFile fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelFile.class);
   }
 
- /**
-  * Convert an instance of ModelFile to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelFile to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelList.java
index f68e49245766..7646fc842ed3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelList.java
@@ -65,10 +65,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   public String get123list() {
     return _123list;
@@ -151,12 +151,12 @@ public ModelList[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelList
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelList
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelList.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -206,22 +206,22 @@ public ModelList read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelList given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelList
-  * @throws IOException if the JSON string is invalid with respect to ModelList
-  */
+  /**
+   * Create an instance of ModelList given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelList
+   * @throws IOException if the JSON string is invalid with respect to ModelList
+   */
   public static ModelList fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelList.class);
   }
 
- /**
-  * Convert an instance of ModelList to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelList to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
index ef02b8cdc5e4..106d07ddcbc5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -65,10 +65,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getReturn() {
     return _return;
@@ -151,12 +151,12 @@ public ModelReturn[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelReturn
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelReturn
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelReturn.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -203,22 +203,22 @@ public ModelReturn read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ModelReturn given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelReturn
-  * @throws IOException if the JSON string is invalid with respect to ModelReturn
-  */
+  /**
+   * Create an instance of ModelReturn given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelReturn
+   * @throws IOException if the JSON string is invalid with respect to ModelReturn
+   */
   public static ModelReturn fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelReturn.class);
   }
 
- /**
-  * Convert an instance of ModelReturn to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelReturn to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
index 13fb5b52d10b..0e8952ce1d9c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
@@ -86,10 +86,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public Integer getName() {
     return name;
@@ -100,10 +100,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getSnakeCase() {
     return snakeCase;
@@ -116,10 +116,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   public String getProperty() {
     return property;
@@ -130,10 +130,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   public Integer get123number() {
     return _123number;
@@ -229,12 +229,12 @@ public Name[] newArray(int size) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Name
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Name
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Name.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -291,22 +291,22 @@ public Name read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Name given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Name
-  * @throws IOException if the JSON string is invalid with respect to Name
-  */
+  /**
+   * Create an instance of Name given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Name
+   * @throws IOException if the JSON string is invalid with respect to Name
+   */
   public static Name fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Name.class);
   }
 
- /**
-  * Convert an instance of Name to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Name to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
index 16b91f5711cb..27e17b864c61 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -66,10 +66,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getJustNumber() {
     return justNumber;
@@ -152,12 +152,12 @@ public NumberOnly[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -204,22 +204,22 @@ public NumberOnly read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of NumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NumberOnly
-  * @throws IOException if the JSON string is invalid with respect to NumberOnly
-  */
+  /**
+   * Create an instance of NumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NumberOnly
+   * @throws IOException if the JSON string is invalid with respect to NumberOnly
+   */
   public static NumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NumberOnly.class);
   }
 
- /**
-  * Convert an instance of NumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
index 805f0cab5e20..03d493a2f3fc 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
@@ -140,10 +140,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -159,10 +159,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -178,10 +178,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -197,10 +197,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -216,10 +216,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -235,10 +235,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -346,12 +346,12 @@ public Order[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -405,22 +405,22 @@ public Order read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
index b23955a2195c..5c749222ae16 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -74,10 +74,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -93,10 +93,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   public String getMyString() {
     return myString;
@@ -112,10 +112,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getMyBoolean() {
     return myBoolean;
@@ -208,12 +208,12 @@ public OuterComposite[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to OuterComposite
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to OuterComposite
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!OuterComposite.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -263,22 +263,22 @@ public OuterComposite read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of OuterComposite given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of OuterComposite
-  * @throws IOException if the JSON string is invalid with respect to OuterComposite
-  */
+  /**
+   * Create an instance of OuterComposite given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of OuterComposite
+   * @throws IOException if the JSON string is invalid with respect to OuterComposite
+   */
   public static OuterComposite fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, OuterComposite.class);
   }
 
- /**
-  * Convert an instance of OuterComposite to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of OuterComposite to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 96dadca79b30..5514b63bdd53 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
@@ -145,10 +145,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -164,10 +164,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -183,10 +183,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -210,10 +210,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public Set<String> getPhotoUrls() {
     return photoUrls;
@@ -237,10 +237,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -256,10 +256,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -369,12 +369,12 @@ public Pet[] newArray(int size) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -462,22 +462,22 @@ public Pet read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index bd6eb58afc8d..5f59f8801f31 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -71,10 +71,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   public String getBar() {
     return bar;
@@ -87,10 +87,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   public String getBaz() {
     return baz;
@@ -178,12 +178,12 @@ public ReadOnlyFirst[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ReadOnlyFirst
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ReadOnlyFirst
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ReadOnlyFirst.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -236,22 +236,22 @@ public ReadOnlyFirst read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of ReadOnlyFirst given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ReadOnlyFirst
-  * @throws IOException if the JSON string is invalid with respect to ReadOnlyFirst
-  */
+  /**
+   * Create an instance of ReadOnlyFirst given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ReadOnlyFirst
+   * @throws IOException if the JSON string is invalid with respect to ReadOnlyFirst
+   */
   public static ReadOnlyFirst fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ReadOnlyFirst.class);
   }
 
- /**
-  * Convert an instance of ReadOnlyFirst to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ReadOnlyFirst to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
index acd377e252d4..f530301c09dd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -65,10 +65,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
@@ -151,12 +151,12 @@ public SpecialModelName[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to SpecialModelName
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to SpecialModelName
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!SpecialModelName.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -203,22 +203,22 @@ public SpecialModelName read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of SpecialModelName given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of SpecialModelName
-  * @throws IOException if the JSON string is invalid with respect to SpecialModelName
-  */
+  /**
+   * Create an instance of SpecialModelName given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of SpecialModelName
+   * @throws IOException if the JSON string is invalid with respect to SpecialModelName
+   */
   public static SpecialModelName fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, SpecialModelName.class);
   }
 
- /**
-  * Convert an instance of SpecialModelName to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of SpecialModelName to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
index 84f67d9f6580..33650bd1a4b0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
@@ -69,10 +69,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -88,10 +88,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -179,12 +179,12 @@ public Tag[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -234,22 +234,22 @@ public Tag read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 95a4af703f33..e24f87e76f96 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -84,10 +84,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   public String getStringItem() {
     return stringItem;
@@ -103,10 +103,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -122,10 +122,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Integer getIntegerItem() {
     return integerItem;
@@ -141,10 +141,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Boolean getBoolItem() {
     return boolItem;
@@ -168,10 +168,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   public List<Integer> getArrayItem() {
     return arrayItem;
@@ -279,12 +279,12 @@ public TypeHolderDefault[] newArray(int size) {
     openapiRequiredFields.add("array_item");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TypeHolderDefault
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TypeHolderDefault
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TypeHolderDefault.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -347,22 +347,22 @@ public TypeHolderDefault read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of TypeHolderDefault given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TypeHolderDefault
-  * @throws IOException if the JSON string is invalid with respect to TypeHolderDefault
-  */
+  /**
+   * Create an instance of TypeHolderDefault given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TypeHolderDefault
+   * @throws IOException if the JSON string is invalid with respect to TypeHolderDefault
+   */
   public static TypeHolderDefault fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TypeHolderDefault.class);
   }
 
- /**
-  * Convert an instance of TypeHolderDefault to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TypeHolderDefault to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 27660be82d67..bb58d748e393 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -88,10 +88,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   public String getStringItem() {
     return stringItem;
@@ -107,10 +107,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -126,10 +126,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Float getFloatItem() {
     return floatItem;
@@ -145,10 +145,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Integer getIntegerItem() {
     return integerItem;
@@ -164,10 +164,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   public Boolean getBoolItem() {
     return boolItem;
@@ -191,10 +191,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   public List<Integer> getArrayItem() {
     return arrayItem;
@@ -308,12 +308,12 @@ public TypeHolderExample[] newArray(int size) {
     openapiRequiredFields.add("array_item");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TypeHolderExample
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TypeHolderExample
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TypeHolderExample.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -376,22 +376,22 @@ public TypeHolderExample read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of TypeHolderExample given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TypeHolderExample
-  * @throws IOException if the JSON string is invalid with respect to TypeHolderExample
-  */
+  /**
+   * Create an instance of TypeHolderExample given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TypeHolderExample
+   * @throws IOException if the JSON string is invalid with respect to TypeHolderExample
+   */
   public static TypeHolderExample fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TypeHolderExample.class);
   }
 
- /**
-  * Convert an instance of TypeHolderExample to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TypeHolderExample to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
index f23464c6f196..952372f10037 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
@@ -93,10 +93,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -112,10 +112,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -131,10 +131,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -150,10 +150,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -169,10 +169,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -188,10 +188,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -207,10 +207,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -226,10 +226,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -347,12 +347,12 @@ public User[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -417,22 +417,22 @@ public User read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 88ef16069fe8..6424ebb7f6be 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
@@ -180,10 +180,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
   public String getAttributeString() {
     return attributeString;
@@ -199,10 +199,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -218,10 +218,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -237,10 +237,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -264,10 +264,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -283,10 +283,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
   public String getNameString() {
     return nameString;
@@ -302,10 +302,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -321,10 +321,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getNameInteger() {
     return nameInteger;
@@ -340,10 +340,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -367,10 +367,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNameArray() {
     return nameArray;
@@ -394,10 +394,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -413,10 +413,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
   public String getPrefixString() {
     return prefixString;
@@ -432,10 +432,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -451,10 +451,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -470,10 +470,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -497,10 +497,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -524,10 +524,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -543,10 +543,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
   public String getNamespaceString() {
     return namespaceString;
@@ -562,10 +562,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -581,10 +581,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -600,10 +600,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -627,10 +627,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -654,10 +654,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -673,10 +673,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
   public String getPrefixNsString() {
     return prefixNsString;
@@ -692,10 +692,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -711,10 +711,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -730,10 +730,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -757,10 +757,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -784,10 +784,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
@@ -1010,12 +1010,12 @@ public XmlItem[] newArray(int size) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to XmlItem
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to XmlItem
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!XmlItem.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -1113,22 +1113,22 @@ public XmlItem read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of XmlItem given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of XmlItem
-  * @throws IOException if the JSON string is invalid with respect to XmlItem
-  */
+  /**
+   * Create an instance of XmlItem given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of XmlItem
+   * @throws IOException if the JSON string is invalid with respect to XmlItem
+   */
   public static XmlItem fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, XmlItem.class);
   }
 
- /**
-  * Convert an instance of XmlItem to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of XmlItem to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java
index b1cf83aeeed6..f3cfde2fc186 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Category.java
@@ -70,10 +70,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
@@ -90,10 +90,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
@@ -205,12 +205,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -295,22 +295,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 65959d3706d8..73a09f6f2fdd 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -74,10 +74,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
@@ -94,10 +94,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
@@ -114,10 +114,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
@@ -232,12 +232,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -325,22 +325,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
index d3b6db62adce..061fa9a4f09c 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Order.java
@@ -141,10 +141,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
@@ -161,10 +161,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
@@ -181,10 +181,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
@@ -201,10 +201,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
@@ -221,10 +221,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
@@ -241,10 +241,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
@@ -368,12 +368,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -462,22 +462,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 265b701ebfd2..70150ecd80d1 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
@@ -145,10 +145,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
@@ -165,10 +165,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
@@ -185,10 +185,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
@@ -213,10 +213,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
@@ -241,10 +241,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
@@ -262,11 +262,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
@@ -394,12 +394,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -522,22 +522,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java
index 5ffa4a9bbd3e..8c02245c017b 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/Tag.java
@@ -70,10 +70,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
@@ -90,10 +90,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
@@ -205,12 +205,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -295,22 +295,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java
index 8e03d48a129d..91f3d98efb5c 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger1/src/main/java/org/openapitools/client/model/User.java
@@ -94,10 +94,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
@@ -114,10 +114,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
@@ -134,10 +134,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
@@ -154,10 +154,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
@@ -174,10 +174,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
@@ -194,10 +194,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
@@ -214,10 +214,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
@@ -234,10 +234,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
@@ -367,12 +367,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -472,22 +472,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Category.java
index b0eac56a92e2..3e2244bc3826 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Category.java
@@ -69,10 +69,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Long getId() {
@@ -89,10 +89,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getName() {
@@ -204,12 +204,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -294,22 +294,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 0f0cf49fc00f..df2d1aa21dac 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -73,10 +73,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Integer getCode() {
@@ -93,10 +93,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getType() {
@@ -113,10 +113,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getMessage() {
@@ -231,12 +231,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -324,22 +324,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java
index 8b5bf29d28d9..777cc0f0357d 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -140,10 +140,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Long getId() {
@@ -160,10 +160,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Long getPetId() {
@@ -180,10 +180,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Integer getQuantity() {
@@ -200,10 +200,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public OffsetDateTime getShipDate() {
@@ -220,10 +220,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order Status")
   public StatusEnum getStatus() {
@@ -240,10 +240,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Boolean getComplete() {
@@ -367,12 +367,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -461,22 +461,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java
index 66b5e34ec778..3128ff7b5a5a 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Pet.java
@@ -144,10 +144,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Long getId() {
@@ -164,10 +164,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Category getCategory() {
@@ -184,10 +184,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   public String getName() {
@@ -212,10 +212,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   public List<String> getPhotoUrls() {
@@ -240,10 +240,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public List<Tag> getTags() {
@@ -261,11 +261,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "pet status in the store")
@@ -393,12 +393,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -521,22 +521,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Tag.java
index ee24b327b311..b4712adb6993 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/Tag.java
@@ -69,10 +69,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Long getId() {
@@ -89,10 +89,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getName() {
@@ -204,12 +204,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -294,22 +294,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/User.java
index 99c75c283547..4853a12694cc 100644
--- a/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-swagger2/src/main/java/org/openapitools/client/model/User.java
@@ -93,10 +93,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public Long getId() {
@@ -113,10 +113,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getUsername() {
@@ -133,10 +133,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getFirstName() {
@@ -153,10 +153,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getLastName() {
@@ -173,10 +173,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getEmail() {
@@ -193,10 +193,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getPassword() {
@@ -213,10 +213,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   public String getPhone() {
@@ -233,10 +233,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "User Status")
   public Integer getUserStatus() {
@@ -366,12 +366,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -471,22 +471,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 bb6813c5c293..93121530e530 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
@@ -102,10 +102,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, String> getMapProperty() {
     return mapProperty;
@@ -129,10 +129,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, String>> getMapOfMapProperty() {
     return mapOfMapProperty;
@@ -148,10 +148,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnytype1() {
     return anytype1;
@@ -167,10 +167,10 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype1(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype1
    * @return mapWithUndeclaredPropertiesAnytype1
-  **/
+   */
   @javax.annotation.Nullable
   public Object getMapWithUndeclaredPropertiesAnytype1() {
     return mapWithUndeclaredPropertiesAnytype1;
@@ -186,10 +186,10 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype2(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype2
    * @return mapWithUndeclaredPropertiesAnytype2
-  **/
+   */
   @javax.annotation.Nullable
   public Object getMapWithUndeclaredPropertiesAnytype2() {
     return mapWithUndeclaredPropertiesAnytype2;
@@ -213,10 +213,10 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesAnytype3Item(Stri
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype3
    * @return mapWithUndeclaredPropertiesAnytype3
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Object> getMapWithUndeclaredPropertiesAnytype3() {
     return mapWithUndeclaredPropertiesAnytype3;
@@ -232,10 +232,10 @@ public AdditionalPropertiesClass emptyMap(Object emptyMap) {
     return this;
   }
 
-   /**
+  /**
    * an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
    * @return emptyMap
-  **/
+   */
   @javax.annotation.Nullable
   public Object getEmptyMap() {
     return emptyMap;
@@ -259,10 +259,10 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesStringItem(String
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesString
    * @return mapWithUndeclaredPropertiesString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, String> getMapWithUndeclaredPropertiesString() {
     return mapWithUndeclaredPropertiesString;
@@ -402,12 +402,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AdditionalPropertiesClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AdditionalPropertiesClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -489,22 +489,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AdditionalPropertiesClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AdditionalPropertiesClass
-  * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesClass
-  */
+  /**
+   * Create an instance of AdditionalPropertiesClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AdditionalPropertiesClass
+   * @throws IOException if the JSON string is invalid with respect to AdditionalPropertiesClass
+   */
   public static AdditionalPropertiesClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AdditionalPropertiesClass.class);
   }
 
- /**
-  * Convert an instance of AdditionalPropertiesClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AdditionalPropertiesClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOf.java
index 0601ad0722b3..bdbb45ede43c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOf.java
@@ -77,10 +77,10 @@ public AllOfModelArrayAnyOf id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -96,10 +96,10 @@ public AllOfModelArrayAnyOf name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -115,10 +115,10 @@ public AllOfModelArrayAnyOf linkListColumn1(AllOfModelArrayAnyOfAllOfLinkListCol
     return this;
   }
 
-   /**
+  /**
    * Get linkListColumn1
    * @return linkListColumn1
-  **/
+   */
   @javax.annotation.Nullable
   public AllOfModelArrayAnyOfAllOfLinkListColumn1 getLinkListColumn1() {
     return linkListColumn1;
@@ -134,10 +134,10 @@ public AllOfModelArrayAnyOf attributes(AllOfModelArrayAnyOfAllOfAttributes attri
     return this;
   }
 
-   /**
+  /**
    * Get attributes
    * @return attributes
-  **/
+   */
   @javax.annotation.Nullable
   public AllOfModelArrayAnyOfAllOfAttributes getAttributes() {
     return attributes;
@@ -255,12 +255,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AllOfModelArrayAnyOf
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AllOfModelArrayAnyOf
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AllOfModelArrayAnyOf.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -360,22 +360,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AllOfModelArrayAnyOf given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AllOfModelArrayAnyOf
-  * @throws IOException if the JSON string is invalid with respect to AllOfModelArrayAnyOf
-  */
+  /**
+   * Create an instance of AllOfModelArrayAnyOf given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AllOfModelArrayAnyOf
+   * @throws IOException if the JSON string is invalid with respect to AllOfModelArrayAnyOf
+   */
   public static AllOfModelArrayAnyOf fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AllOfModelArrayAnyOf.class);
   }
 
- /**
-  * Convert an instance of AllOfModelArrayAnyOf to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AllOfModelArrayAnyOf to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributes.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributes.java
index 395c46bf49b7..0961268f8aaa 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributes.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfAttributes.java
@@ -64,10 +64,10 @@ public AllOfModelArrayAnyOfAllOfAttributes C(AllOfModelArrayAnyOfAllOfAttributes
     return this;
   }
 
-   /**
+  /**
    * Get C
    * @return C
-  **/
+   */
   @javax.annotation.Nullable
   public AllOfModelArrayAnyOfAllOfAttributesC getC() {
     return C;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AllOfModelArrayAnyOfAllOfAttributes
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AllOfModelArrayAnyOfAllOfAttributes
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AllOfModelArrayAnyOfAllOfAttributes.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -266,22 +266,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AllOfModelArrayAnyOfAllOfAttributes given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AllOfModelArrayAnyOfAllOfAttributes
-  * @throws IOException if the JSON string is invalid with respect to AllOfModelArrayAnyOfAllOfAttributes
-  */
+  /**
+   * Create an instance of AllOfModelArrayAnyOfAllOfAttributes given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AllOfModelArrayAnyOfAllOfAttributes
+   * @throws IOException if the JSON string is invalid with respect to AllOfModelArrayAnyOfAllOfAttributes
+   */
   public static AllOfModelArrayAnyOfAllOfAttributes fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AllOfModelArrayAnyOfAllOfAttributes.class);
   }
 
- /**
-  * Convert an instance of AllOfModelArrayAnyOfAllOfAttributes to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AllOfModelArrayAnyOfAllOfAttributes to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfLinkListColumn1.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfLinkListColumn1.java
index 9313097628a9..b26321005c2d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfLinkListColumn1.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AllOfModelArrayAnyOfAllOfLinkListColumn1.java
@@ -74,10 +74,10 @@ public AllOfModelArrayAnyOfAllOfLinkListColumn1 addValueItem(AllOfModelArrayAnyO
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   public List<AllOfModelArrayAnyOfAllOfLinkListColumn1Value> getValue() {
     return value;
@@ -186,12 +186,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("value");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AllOfModelArrayAnyOfAllOfLinkListColumn1
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AllOfModelArrayAnyOfAllOfLinkListColumn1
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AllOfModelArrayAnyOfAllOfLinkListColumn1.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of AllOfModelArrayAnyOfAllOfLinkListColumn1 given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AllOfModelArrayAnyOfAllOfLinkListColumn1
-  * @throws IOException if the JSON string is invalid with respect to AllOfModelArrayAnyOfAllOfLinkListColumn1
-  */
+  /**
+   * Create an instance of AllOfModelArrayAnyOfAllOfLinkListColumn1 given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AllOfModelArrayAnyOfAllOfLinkListColumn1
+   * @throws IOException if the JSON string is invalid with respect to AllOfModelArrayAnyOfAllOfLinkListColumn1
+   */
   public static AllOfModelArrayAnyOfAllOfLinkListColumn1 fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AllOfModelArrayAnyOfAllOfLinkListColumn1.class);
   }
 
- /**
-  * Convert an instance of AllOfModelArrayAnyOfAllOfLinkListColumn1 to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AllOfModelArrayAnyOfAllOfLinkListColumn1 to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
index 4cfd4e4783e6..0452182bdcf7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
@@ -68,10 +68,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -87,10 +87,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   public String getColor() {
     return color;
@@ -202,12 +202,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Animal
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Animal
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Animal.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -229,22 +229,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of Animal given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Animal
-  * @throws IOException if the JSON string is invalid with respect to Animal
-  */
+  /**
+   * Create an instance of Animal given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Animal
+   * @throws IOException if the JSON string is invalid with respect to Animal
+   */
   public static Animal fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Animal.class);
   }
 
- /**
-  * Convert an instance of Animal to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Animal to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java
index 790f55fff495..59a6110057e0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Apple.java
@@ -67,10 +67,10 @@ public Apple cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nullable
   public String getCultivar() {
     return cultivar;
@@ -86,10 +86,10 @@ public Apple origin(String origin) {
     return this;
   }
 
-   /**
+  /**
    * Get origin
    * @return origin
-  **/
+   */
   @javax.annotation.Nullable
   public String getOrigin() {
     return origin;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Apple
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Apple
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Apple.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -293,22 +293,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Apple given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Apple
-  * @throws IOException if the JSON string is invalid with respect to Apple
-  */
+  /**
+   * Create an instance of Apple given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Apple
+   * @throws IOException if the JSON string is invalid with respect to Apple
+   */
   public static Apple fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Apple.class);
   }
 
- /**
-  * Convert an instance of Apple to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Apple to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AppleReq.java
index 544e55f491d7..55461ff09bde 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AppleReq.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AppleReq.java
@@ -67,10 +67,10 @@ public AppleReq cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nonnull
   public String getCultivar() {
     return cultivar;
@@ -86,10 +86,10 @@ public AppleReq mealy(Boolean mealy) {
     return this;
   }
 
-   /**
+  /**
    * Get mealy
    * @return mealy
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getMealy() {
     return mealy;
@@ -155,12 +155,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("cultivar");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to AppleReq
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to AppleReq
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!AppleReq.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -217,22 +217,22 @@ public AppleReq read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of AppleReq given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of AppleReq
-  * @throws IOException if the JSON string is invalid with respect to AppleReq
-  */
+  /**
+   * Create an instance of AppleReq given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of AppleReq
+   * @throws IOException if the JSON string is invalid with respect to AppleReq
+   */
   public static AppleReq fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, AppleReq.class);
   }
 
- /**
-  * Convert an instance of AppleReq to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of AppleReq to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayDefault.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayDefault.java
index fc7887402ae5..47e05cbc8f4f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayDefault.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayDefault.java
@@ -77,10 +77,10 @@ public ArrayDefault addWithDefaultEmptyBracketItem(String withDefaultEmptyBracke
     return this;
   }
 
-   /**
+  /**
    * Get withDefaultEmptyBracket
    * @return withDefaultEmptyBracket
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getWithDefaultEmptyBracket() {
     return withDefaultEmptyBracket;
@@ -104,10 +104,10 @@ public ArrayDefault addWithoutDefaultItem(String withoutDefaultItem) {
     return this;
   }
 
-   /**
+  /**
    * Get withoutDefault
    * @return withoutDefault
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getWithoutDefault() {
     return withoutDefault;
@@ -218,12 +218,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayDefault
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayDefault
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayDefault.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -313,22 +313,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ArrayDefault given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayDefault
-  * @throws IOException if the JSON string is invalid with respect to ArrayDefault
-  */
+  /**
+   * Create an instance of ArrayDefault given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayDefault
+   * @throws IOException if the JSON string is invalid with respect to ArrayDefault
+   */
   public static ArrayDefault fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayDefault.class);
   }
 
- /**
-  * Convert an instance of ArrayDefault to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayDefault to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 f5699904e7d0..b27cb262af6d 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
@@ -74,10 +74,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
@@ -185,12 +185,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfArrayOfNumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfArrayOfNumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfArrayOfNumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -276,22 +276,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ArrayOfArrayOfNumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfArrayOfNumberOnly
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfArrayOfNumberOnly
-  */
+  /**
+   * Create an instance of ArrayOfArrayOfNumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfArrayOfNumberOnly
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfArrayOfNumberOnly
+   */
   public static ArrayOfArrayOfNumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfArrayOfNumberOnly.class);
   }
 
- /**
-  * Convert an instance of ArrayOfArrayOfNumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfArrayOfNumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 384450b416cc..2cd1e6454dc8 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
@@ -74,10 +74,10 @@ public ArrayOfInlineAllOf id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -93,10 +93,10 @@ public ArrayOfInlineAllOf name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -120,10 +120,10 @@ public ArrayOfInlineAllOf addArrayAllofDogPropertyItem(ArrayOfInlineAllOfArrayAl
     return this;
   }
 
-   /**
+  /**
    * Get arrayAllofDogProperty
    * @return arrayAllofDogProperty
-  **/
+   */
   @javax.annotation.Nullable
   public List<ArrayOfInlineAllOfArrayAllofDogPropertyInner> getArrayAllofDogProperty() {
     return arrayAllofDogProperty;
@@ -238,12 +238,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfInlineAllOf
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfInlineAllOf
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfInlineAllOf.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -349,22 +349,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ArrayOfInlineAllOf given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfInlineAllOf
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfInlineAllOf
-  */
+  /**
+   * Create an instance of ArrayOfInlineAllOf given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfInlineAllOf
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfInlineAllOf
+   */
   public static ArrayOfInlineAllOf fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfInlineAllOf.class);
   }
 
- /**
-  * Convert an instance of ArrayOfInlineAllOf to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfInlineAllOf to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java
index 93677e1ee504..146f9e42c673 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java
@@ -67,10 +67,10 @@ public ArrayOfInlineAllOfArrayAllofDogPropertyInner breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   public String getBreed() {
     return breed;
@@ -86,10 +86,10 @@ public ArrayOfInlineAllOfArrayAllofDogPropertyInner color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   public String getColor() {
     return color;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInner
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInner
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfInlineAllOfArrayAllofDogPropertyInner.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -293,22 +293,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInner given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfInlineAllOfArrayAllofDogPropertyInner
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInner
-  */
+  /**
+   * Create an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInner given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfInlineAllOfArrayAllofDogPropertyInner
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInner
+   */
   public static ArrayOfInlineAllOfArrayAllofDogPropertyInner fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfInlineAllOfArrayAllofDogPropertyInner.class);
   }
 
- /**
-  * Convert an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInner to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInner to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 cc75f118ea6f..ae52bba5e34a 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
@@ -74,10 +74,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
@@ -185,12 +185,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayOfNumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayOfNumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayOfNumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -276,22 +276,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ArrayOfNumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayOfNumberOnly
-  * @throws IOException if the JSON string is invalid with respect to ArrayOfNumberOnly
-  */
+  /**
+   * Create an instance of ArrayOfNumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayOfNumberOnly
+   * @throws IOException if the JSON string is invalid with respect to ArrayOfNumberOnly
+   */
   public static ArrayOfNumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayOfNumberOnly.class);
   }
 
- /**
-  * Convert an instance of ArrayOfNumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayOfNumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 5df37fd7843c..162a6aed9155 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
@@ -82,10 +82,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -109,10 +109,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -136,10 +136,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
@@ -253,12 +253,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ArrayTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ArrayTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ArrayTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -352,22 +352,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ArrayTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ArrayTest
-  * @throws IOException if the JSON string is invalid with respect to ArrayTest
-  */
+  /**
+   * Create an instance of ArrayTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ArrayTest
+   * @throws IOException if the JSON string is invalid with respect to ArrayTest
+   */
   public static ArrayTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ArrayTest.class);
   }
 
- /**
-  * Convert an instance of ArrayTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ArrayTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java
index 72f8491b113d..9c25542c9701 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Banana.java
@@ -64,10 +64,10 @@ public Banana lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getLengthCm() {
     return lengthCm;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Banana
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Banana
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Banana.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -262,22 +262,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Banana given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Banana
-  * @throws IOException if the JSON string is invalid with respect to Banana
-  */
+  /**
+   * Create an instance of Banana given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Banana
+   * @throws IOException if the JSON string is invalid with respect to Banana
+   */
   public static Banana fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Banana.class);
   }
 
- /**
-  * Convert an instance of Banana to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Banana to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BananaReq.java
index d0cc526b96c7..3aa1546d1f3b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BananaReq.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BananaReq.java
@@ -68,10 +68,10 @@ public BananaReq lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getLengthCm() {
     return lengthCm;
@@ -87,10 +87,10 @@ public BananaReq sweet(Boolean sweet) {
     return this;
   }
 
-   /**
+  /**
    * Get sweet
    * @return sweet
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getSweet() {
     return sweet;
@@ -156,12 +156,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("lengthCm");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to BananaReq
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to BananaReq
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!BananaReq.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -215,22 +215,22 @@ public BananaReq read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of BananaReq given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of BananaReq
-  * @throws IOException if the JSON string is invalid with respect to BananaReq
-  */
+  /**
+   * Create an instance of BananaReq given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of BananaReq
+   * @throws IOException if the JSON string is invalid with respect to BananaReq
+   */
   public static BananaReq fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, BananaReq.class);
   }
 
- /**
-  * Convert an instance of BananaReq to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of BananaReq to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java
index 1cb9c42350fc..db35a422e2c9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/BasquePig.java
@@ -63,10 +63,10 @@ public BasquePig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to BasquePig
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to BasquePig
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!BasquePig.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -272,22 +272,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of BasquePig given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of BasquePig
-  * @throws IOException if the JSON string is invalid with respect to BasquePig
-  */
+  /**
+   * Create an instance of BasquePig given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of BasquePig
+   * @throws IOException if the JSON string is invalid with respect to BasquePig
+   */
   public static BasquePig fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, BasquePig.class);
   }
 
- /**
-  * Convert an instance of BasquePig to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of BasquePig to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
index 36b70c53b41b..c08090c82806 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -83,10 +83,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   public String getSmallCamel() {
     return smallCamel;
@@ -102,10 +102,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   public String getCapitalCamel() {
     return capitalCamel;
@@ -121,10 +121,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   public String getSmallSnake() {
     return smallSnake;
@@ -140,10 +140,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   public String getCapitalSnake() {
     return capitalSnake;
@@ -159,10 +159,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -178,10 +178,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   public String getATTNAME() {
     return ATT_NAME;
@@ -304,12 +304,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Capitalization
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Capitalization
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Capitalization.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -409,22 +409,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Capitalization given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Capitalization
-  * @throws IOException if the JSON string is invalid with respect to Capitalization
-  */
+  /**
+   * Create an instance of Capitalization given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Capitalization
+   * @throws IOException if the JSON string is invalid with respect to Capitalization
+   */
   public static Capitalization fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Capitalization.class);
   }
 
- /**
-  * Convert an instance of Capitalization to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Capitalization to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
index a08afa3acca6..adf02293a894 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
@@ -66,10 +66,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getDeclawed() {
     return declawed;
@@ -182,12 +182,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Cat
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Cat
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Cat.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -275,22 +275,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Cat given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Cat
-  * @throws IOException if the JSON string is invalid with respect to Cat
-  */
+  /**
+   * Create an instance of Cat given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Cat
+   * @throws IOException if the JSON string is invalid with respect to Cat
+   */
   public static Cat fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Cat.class);
   }
 
- /**
-  * Convert an instance of Cat to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Cat to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
index 569c709ede3e..472fd9e7313a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -67,10 +67,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -201,12 +201,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Category
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Category
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Category.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -298,22 +298,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Category given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Category
-  * @throws IOException if the JSON string is invalid with respect to Category
-  */
+  /**
+   * Create an instance of Category given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Category
+   * @throws IOException if the JSON string is invalid with respect to Category
+   */
   public static Category fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Category.class);
   }
 
- /**
-  * Convert an instance of Category to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Category to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
index 3508ddb27a64..d425b108313d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -63,10 +63,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   public String getPropertyClass() {
     return propertyClass;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ClassModel
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ClassModel
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ClassModel.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ClassModel given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ClassModel
-  * @throws IOException if the JSON string is invalid with respect to ClassModel
-  */
+  /**
+   * Create an instance of ClassModel given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ClassModel
+   * @throws IOException if the JSON string is invalid with respect to ClassModel
+   */
   public static ClassModel fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ClassModel.class);
   }
 
- /**
-  * Convert an instance of ClassModel to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ClassModel to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
index a5c1608aacbe..ea156dda4902 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
@@ -63,10 +63,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   public String getClient() {
     return client;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Client
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Client
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Client.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Client given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Client
-  * @throws IOException if the JSON string is invalid with respect to Client
-  */
+  /**
+   * Create an instance of Client given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Client
+   * @throws IOException if the JSON string is invalid with respect to Client
+   */
   public static Client fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Client.class);
   }
 
- /**
-  * Convert an instance of Client to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Client to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
index 0ed12180c6d9..b20b800c1c5e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
@@ -67,10 +67,10 @@ public ComplexQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getShapeType() {
     return shapeType;
@@ -86,10 +86,10 @@ public ComplexQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getQuadrilateralType() {
     return quadrilateralType;
@@ -202,12 +202,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("quadrilateralType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ComplexQuadrilateral
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ComplexQuadrilateral
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ComplexQuadrilateral.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -302,22 +302,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ComplexQuadrilateral given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ComplexQuadrilateral
-  * @throws IOException if the JSON string is invalid with respect to ComplexQuadrilateral
-  */
+  /**
+   * Create an instance of ComplexQuadrilateral given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ComplexQuadrilateral
+   * @throws IOException if the JSON string is invalid with respect to ComplexQuadrilateral
+   */
   public static ComplexQuadrilateral fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ComplexQuadrilateral.class);
   }
 
- /**
-  * Convert an instance of ComplexQuadrilateral to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ComplexQuadrilateral to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java
index 1214f217a1c5..f5bd66a937bd 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DanishPig.java
@@ -63,10 +63,10 @@ public DanishPig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to DanishPig
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to DanishPig
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!DanishPig.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -272,22 +272,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of DanishPig given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of DanishPig
-  * @throws IOException if the JSON string is invalid with respect to DanishPig
-  */
+  /**
+   * Create an instance of DanishPig given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of DanishPig
+   * @throws IOException if the JSON string is invalid with respect to DanishPig
+   */
   public static DanishPig fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, DanishPig.class);
   }
 
- /**
-  * Convert an instance of DanishPig to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of DanishPig to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 8e1f8a3d157a..d18119b1ca7c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -65,10 +65,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -176,12 +176,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to DeprecatedObject
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to DeprecatedObject
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!DeprecatedObject.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -266,22 +266,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of DeprecatedObject given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of DeprecatedObject
-  * @throws IOException if the JSON string is invalid with respect to DeprecatedObject
-  */
+  /**
+   * Create an instance of DeprecatedObject given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of DeprecatedObject
+   * @throws IOException if the JSON string is invalid with respect to DeprecatedObject
+   */
   public static DeprecatedObject fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, DeprecatedObject.class);
   }
 
- /**
-  * Convert an instance of DeprecatedObject to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of DeprecatedObject to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
index 33dc2f11259c..5f412eef9b8b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
@@ -65,10 +65,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   public String getBreed() {
     return breed;
@@ -181,12 +181,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Dog
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Dog
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Dog.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -274,22 +274,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Dog given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Dog
-  * @throws IOException if the JSON string is invalid with respect to Dog
-  */
+  /**
+   * Create an instance of Dog given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Dog
+   * @throws IOException if the JSON string is invalid with respect to Dog
+   */
   public static Dog fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Dog.class);
   }
 
- /**
-  * Convert an instance of Dog to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Dog to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 46cbaa86ebc0..a67974c7420a 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
@@ -82,10 +82,10 @@ public Drawing mainShape(Shape mainShape) {
     return this;
   }
 
-   /**
+  /**
    * Get mainShape
    * @return mainShape
-  **/
+   */
   @javax.annotation.Nullable
   public Shape getMainShape() {
     return mainShape;
@@ -101,10 +101,10 @@ public Drawing shapeOrNull(ShapeOrNull shapeOrNull) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeOrNull
    * @return shapeOrNull
-  **/
+   */
   @javax.annotation.Nullable
   public ShapeOrNull getShapeOrNull() {
     return shapeOrNull;
@@ -120,10 +120,10 @@ public Drawing nullableShape(NullableShape nullableShape) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableShape
    * @return nullableShape
-  **/
+   */
   @javax.annotation.Nullable
   public NullableShape getNullableShape() {
     return nullableShape;
@@ -147,10 +147,10 @@ public Drawing addShapesItem(Shape shapesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get shapes
    * @return shapes
-  **/
+   */
   @javax.annotation.Nullable
   public List<Shape> getShapes() {
     return shapes;
@@ -278,12 +278,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Drawing
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Drawing
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Drawing.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -391,22 +391,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Drawing given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Drawing
-  * @throws IOException if the JSON string is invalid with respect to Drawing
-  */
+  /**
+   * Create an instance of Drawing given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Drawing
+   * @throws IOException if the JSON string is invalid with respect to Drawing
+   */
   public static Drawing fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Drawing.class);
   }
 
- /**
-  * Convert an instance of Drawing to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Drawing to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 78e57a5f7fa6..cf355dd35f65 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
@@ -173,10 +173,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -200,10 +200,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
@@ -314,12 +314,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EnumArrays
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EnumArrays
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EnumArrays.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -412,22 +412,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of EnumArrays given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EnumArrays
-  * @throws IOException if the JSON string is invalid with respect to EnumArrays
-  */
+  /**
+   * Create an instance of EnumArrays given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EnumArrays
+   * @throws IOException if the JSON string is invalid with respect to EnumArrays
+   */
   public static EnumArrays fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EnumArrays.class);
   }
 
- /**
-  * Convert an instance of EnumArrays to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EnumArrays to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
index 0d0a973cdf7e..567123225b9b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumStringDiscriminator.java
@@ -115,10 +115,10 @@ public EnumStringDiscriminator enumStrType(EnumStrTypeEnum enumStrType) {
     return this;
   }
 
-   /**
+  /**
    * enum string type
    * @return enumStrType
-  **/
+   */
   @javax.annotation.Nonnull
   public EnumStrTypeEnum getEnumStrType() {
     return enumStrType;
@@ -227,12 +227,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("enum_str_type");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EnumStringDiscriminator
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EnumStringDiscriminator
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EnumStringDiscriminator.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -320,22 +320,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of EnumStringDiscriminator given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EnumStringDiscriminator
-  * @throws IOException if the JSON string is invalid with respect to EnumStringDiscriminator
-  */
+  /**
+   * Create an instance of EnumStringDiscriminator given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EnumStringDiscriminator
+   * @throws IOException if the JSON string is invalid with respect to EnumStringDiscriminator
+   */
   public static EnumStringDiscriminator fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EnumStringDiscriminator.class);
   }
 
- /**
-  * Convert an instance of EnumStringDiscriminator to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EnumStringDiscriminator to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
index 30e8e6d3071c..b930c25937d6 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -364,10 +364,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -383,10 +383,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -402,10 +402,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -421,10 +421,10 @@ public EnumTest enumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
     return this;
   }
 
-   /**
+  /**
    * Get enumIntegerOnly
    * @return enumIntegerOnly
-  **/
+   */
   @javax.annotation.Nullable
   public EnumIntegerOnlyEnum getEnumIntegerOnly() {
     return enumIntegerOnly;
@@ -440,10 +440,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -459,10 +459,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   public OuterEnum getOuterEnum() {
     return outerEnum;
@@ -478,10 +478,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   public OuterEnumInteger getOuterEnumInteger() {
     return outerEnumInteger;
@@ -497,10 +497,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   public OuterEnumDefaultValue getOuterEnumDefaultValue() {
     return outerEnumDefaultValue;
@@ -516,10 +516,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   public OuterEnumIntegerDefaultValue getOuterEnumIntegerDefaultValue() {
     return outerEnumIntegerDefaultValue;
@@ -663,12 +663,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("enum_string_required");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EnumTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EnumTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EnumTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -797,22 +797,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of EnumTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EnumTest
-  * @throws IOException if the JSON string is invalid with respect to EnumTest
-  */
+  /**
+   * Create an instance of EnumTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EnumTest
+   * @throws IOException if the JSON string is invalid with respect to EnumTest
+   */
   public static EnumTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EnumTest.class);
   }
 
- /**
-  * Convert an instance of EnumTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EnumTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
index 8eb7ac786f06..b3654ad20125 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
@@ -67,10 +67,10 @@ public EquilateralTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getShapeType() {
     return shapeType;
@@ -86,10 +86,10 @@ public EquilateralTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getTriangleType() {
     return triangleType;
@@ -202,12 +202,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("triangleType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to EquilateralTriangle
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to EquilateralTriangle
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!EquilateralTriangle.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -302,22 +302,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of EquilateralTriangle given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of EquilateralTriangle
-  * @throws IOException if the JSON string is invalid with respect to EquilateralTriangle
-  */
+  /**
+   * Create an instance of EquilateralTriangle given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of EquilateralTriangle
+   * @throws IOException if the JSON string is invalid with respect to EquilateralTriangle
+   */
   public static EquilateralTriangle fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, EquilateralTriangle.class);
   }
 
- /**
-  * Convert an instance of EquilateralTriangle to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of EquilateralTriangle to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 11c78d1f071f..49e733beb545 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
@@ -70,10 +70,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   public ModelFile getFile() {
     return _file;
@@ -97,10 +97,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   public List<ModelFile> getFiles() {
     return files;
@@ -211,12 +211,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FileSchemaTestClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FileSchemaTestClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FileSchemaTestClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -316,22 +316,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of FileSchemaTestClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FileSchemaTestClass
-  * @throws IOException if the JSON string is invalid with respect to FileSchemaTestClass
-  */
+  /**
+   * Create an instance of FileSchemaTestClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FileSchemaTestClass
+   * @throws IOException if the JSON string is invalid with respect to FileSchemaTestClass
+   */
   public static FileSchemaTestClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FileSchemaTestClass.class);
   }
 
- /**
-  * Convert an instance of FileSchemaTestClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FileSchemaTestClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java
index 53345a830d88..6af5b6ad4942 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Foo.java
@@ -63,10 +63,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   public String getBar() {
     return bar;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Foo
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Foo
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Foo.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Foo given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Foo
-  * @throws IOException if the JSON string is invalid with respect to Foo
-  */
+  /**
+   * Create an instance of Foo given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Foo
+   * @throws IOException if the JSON string is invalid with respect to Foo
+   */
   public static Foo fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Foo.class);
   }
 
- /**
-  * Convert an instance of Foo to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Foo to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 38b8329c70d3..8bc2763dbca9 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -64,10 +64,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   public Foo getString() {
     return string;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FooGetDefaultResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FooGetDefaultResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FooGetDefaultResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -266,22 +266,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of FooGetDefaultResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FooGetDefaultResponse
-  * @throws IOException if the JSON string is invalid with respect to FooGetDefaultResponse
-  */
+  /**
+   * Create an instance of FooGetDefaultResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FooGetDefaultResponse
+   * @throws IOException if the JSON string is invalid with respect to FooGetDefaultResponse
+   */
   public static FooGetDefaultResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FooGetDefaultResponse.class);
   }
 
- /**
-  * Convert an instance of FooGetDefaultResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FooGetDefaultResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
index 032aa2f3254d..e37531d4948d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -132,12 +132,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getInteger() {
     return integer;
@@ -153,12 +153,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getInt32() {
     return int32;
@@ -174,10 +174,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   public Long getInt64() {
     return int64;
@@ -193,12 +193,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   public BigDecimal getNumber() {
     return number;
@@ -214,12 +214,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   public Float getFloat() {
     return _float;
@@ -235,12 +235,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   public Double getDouble() {
     return _double;
@@ -256,10 +256,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getDecimal() {
     return decimal;
@@ -275,10 +275,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   public String getString() {
     return string;
@@ -294,10 +294,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   public byte[] getByte() {
     return _byte;
@@ -313,10 +313,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   public File getBinary() {
     return binary;
@@ -332,10 +332,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   public LocalDate getDate() {
     return date;
@@ -351,10 +351,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -370,10 +370,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   public UUID getUuid() {
     return uuid;
@@ -389,10 +389,10 @@ public FormatTest uuidWithDefault(UUID uuidWithDefault) {
     return this;
   }
 
-   /**
+  /**
    * Get uuidWithDefault
    * @return uuidWithDefault
-  **/
+   */
   @javax.annotation.Nullable
   public UUID getUuidWithDefault() {
     return uuidWithDefault;
@@ -408,10 +408,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   public String getPassword() {
     return password;
@@ -427,10 +427,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   public String getPatternWithDigits() {
     return patternWithDigits;
@@ -446,10 +446,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   public String getPatternWithDigitsAndDelimiter() {
     return patternWithDigitsAndDelimiter;
@@ -609,12 +609,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("password");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FormatTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FormatTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FormatTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -721,22 +721,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of FormatTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FormatTest
-  * @throws IOException if the JSON string is invalid with respect to FormatTest
-  */
+  /**
+   * Create an instance of FormatTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FormatTest
+   * @throws IOException if the JSON string is invalid with respect to FormatTest
+   */
   public static FormatTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FormatTest.class);
   }
 
- /**
-  * Convert an instance of FormatTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FormatTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FreeFormObjectTestClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FreeFormObjectTestClass.java
index 120ee6463c17..1d003e232493 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FreeFormObjectTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FreeFormObjectTestClass.java
@@ -68,10 +68,10 @@ public FreeFormObjectTestClass name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -87,10 +87,10 @@ public FreeFormObjectTestClass properties(FreeFormObjectTestClassProperties prop
     return this;
   }
 
-   /**
+  /**
    * Get properties
    * @return properties
-  **/
+   */
   @javax.annotation.Nullable
   public FreeFormObjectTestClassProperties getProperties() {
     return properties;
@@ -201,12 +201,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to FreeFormObjectTestClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to FreeFormObjectTestClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!FreeFormObjectTestClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -295,22 +295,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of FreeFormObjectTestClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of FreeFormObjectTestClass
-  * @throws IOException if the JSON string is invalid with respect to FreeFormObjectTestClass
-  */
+  /**
+   * Create an instance of FreeFormObjectTestClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of FreeFormObjectTestClass
+   * @throws IOException if the JSON string is invalid with respect to FreeFormObjectTestClass
+   */
   public static FreeFormObjectTestClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, FreeFormObjectTestClass.class);
   }
 
- /**
-  * Convert an instance of FreeFormObjectTestClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of FreeFormObjectTestClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
index 4f67fc579f32..bc4d400e5fca 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
@@ -64,10 +64,10 @@ public GrandparentAnimal petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getPetType() {
     return petType;
@@ -176,12 +176,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("pet_type");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to GrandparentAnimal
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to GrandparentAnimal
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!GrandparentAnimal.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -200,22 +200,22 @@ public static void validateJsonElement(JsonElement jsonElement) throws IOExcepti
   }
 
 
- /**
-  * Create an instance of GrandparentAnimal given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of GrandparentAnimal
-  * @throws IOException if the JSON string is invalid with respect to GrandparentAnimal
-  */
+  /**
+   * Create an instance of GrandparentAnimal given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of GrandparentAnimal
+   * @throws IOException if the JSON string is invalid with respect to GrandparentAnimal
+   */
   public static GrandparentAnimal fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, GrandparentAnimal.class);
   }
 
- /**
-  * Convert an instance of GrandparentAnimal to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of GrandparentAnimal to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index b5df60ae2e5d..f643e13bfc19 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -71,10 +71,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   public String getBar() {
     return bar;
@@ -82,10 +82,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   public String getFoo() {
     return foo;
@@ -193,12 +193,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to HasOnlyReadOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to HasOnlyReadOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!HasOnlyReadOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -286,22 +286,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of HasOnlyReadOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of HasOnlyReadOnly
-  * @throws IOException if the JSON string is invalid with respect to HasOnlyReadOnly
-  */
+  /**
+   * Create an instance of HasOnlyReadOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of HasOnlyReadOnly
+   * @throws IOException if the JSON string is invalid with respect to HasOnlyReadOnly
+   */
   public static HasOnlyReadOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, HasOnlyReadOnly.class);
   }
 
- /**
-  * Convert an instance of HasOnlyReadOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of HasOnlyReadOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 1b4cc1475756..d8860acf6b63 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -64,10 +64,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   public String getNullableMessage() {
     return nullableMessage;
@@ -186,12 +186,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to HealthCheckResult
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to HealthCheckResult
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!HealthCheckResult.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -276,22 +276,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of HealthCheckResult given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of HealthCheckResult
-  * @throws IOException if the JSON string is invalid with respect to HealthCheckResult
-  */
+  /**
+   * Create an instance of HealthCheckResult given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of HealthCheckResult
+   * @throws IOException if the JSON string is invalid with respect to HealthCheckResult
+   */
   public static HealthCheckResult fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, HealthCheckResult.class);
   }
 
- /**
-  * Convert an instance of HealthCheckResult to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of HealthCheckResult to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
index 12b89c448ba6..cac204106866 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
@@ -67,10 +67,10 @@ public IsoscelesTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getShapeType() {
     return shapeType;
@@ -86,10 +86,10 @@ public IsoscelesTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getTriangleType() {
     return triangleType;
@@ -156,12 +156,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("triangleType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to IsoscelesTriangle
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to IsoscelesTriangle
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!IsoscelesTriangle.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -221,22 +221,22 @@ public IsoscelesTriangle read(JsonReader in) throws IOException {
     }
   }
 
- /**
-  * Create an instance of IsoscelesTriangle given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of IsoscelesTriangle
-  * @throws IOException if the JSON string is invalid with respect to IsoscelesTriangle
-  */
+  /**
+   * Create an instance of IsoscelesTriangle given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of IsoscelesTriangle
+   * @throws IOException if the JSON string is invalid with respect to IsoscelesTriangle
+   */
   public static IsoscelesTriangle fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, IsoscelesTriangle.class);
   }
 
- /**
-  * Convert an instance of IsoscelesTriangle to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of IsoscelesTriangle to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 ccc5c0ab8024..3876a32e7ab3 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
@@ -137,10 +137,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -164,10 +164,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -191,10 +191,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -218,10 +218,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
@@ -338,12 +338,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to MapTest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to MapTest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!MapTest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -425,22 +425,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of MapTest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of MapTest
-  * @throws IOException if the JSON string is invalid with respect to MapTest
-  */
+  /**
+   * Create an instance of MapTest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of MapTest
+   * @throws IOException if the JSON string is invalid with respect to MapTest
+   */
   public static MapTest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, MapTest.class);
   }
 
- /**
-  * Convert an instance of MapTest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of MapTest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 f673d98753d4..d725aaf5632b 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
@@ -76,10 +76,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   public UUID getUuid() {
     return uuid;
@@ -95,10 +95,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -122,10 +122,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Animal> getMap() {
     return map;
@@ -239,12 +239,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!MixedPropertiesAndAdditionalPropertiesClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -329,22 +329,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of MixedPropertiesAndAdditionalPropertiesClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of MixedPropertiesAndAdditionalPropertiesClass
-  * @throws IOException if the JSON string is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
-  */
+  /**
+   * Create an instance of MixedPropertiesAndAdditionalPropertiesClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of MixedPropertiesAndAdditionalPropertiesClass
+   * @throws IOException if the JSON string is invalid with respect to MixedPropertiesAndAdditionalPropertiesClass
+   */
   public static MixedPropertiesAndAdditionalPropertiesClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, MixedPropertiesAndAdditionalPropertiesClass.class);
   }
 
- /**
-  * Convert an instance of MixedPropertiesAndAdditionalPropertiesClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of MixedPropertiesAndAdditionalPropertiesClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
index beed575fd506..635e17341f2b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -67,10 +67,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getName() {
     return name;
@@ -86,10 +86,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   public String getPropertyClass() {
     return propertyClass;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Model200Response
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Model200Response
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Model200Response.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Model200Response given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Model200Response
-  * @throws IOException if the JSON string is invalid with respect to Model200Response
-  */
+  /**
+   * Create an instance of Model200Response given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Model200Response
+   * @throws IOException if the JSON string is invalid with respect to Model200Response
+   */
   public static Model200Response fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Model200Response.class);
   }
 
- /**
-  * Convert an instance of Model200Response to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Model200Response to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ce2197e4a108..d065a555af18 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -71,10 +71,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getCode() {
     return code;
@@ -90,10 +90,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   public String getMessage() {
     return message;
@@ -226,12 +226,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelApiResponse
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelApiResponse.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -319,22 +319,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelApiResponse given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelApiResponse
-  * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
-  */
+  /**
+   * Create an instance of ModelApiResponse given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelApiResponse
+   * @throws IOException if the JSON string is invalid with respect to ModelApiResponse
+   */
   public static ModelApiResponse fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelApiResponse.class);
   }
 
- /**
-  * Convert an instance of ModelApiResponse to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelApiResponse to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java
index 1957fa70daa0..fabfee63655b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -63,10 +63,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   public String getSourceURI() {
     return sourceURI;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelFile
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelFile
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelFile.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelFile given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelFile
-  * @throws IOException if the JSON string is invalid with respect to ModelFile
-  */
+  /**
+   * Create an instance of ModelFile given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelFile
+   * @throws IOException if the JSON string is invalid with respect to ModelFile
+   */
   public static ModelFile fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelFile.class);
   }
 
- /**
-  * Convert an instance of ModelFile to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelFile to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java
index 964107c69158..9c4fc8d1b4c3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelList.java
@@ -63,10 +63,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   public String get123list() {
     return _123list;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelList
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelList
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelList.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelList given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelList
-  * @throws IOException if the JSON string is invalid with respect to ModelList
-  */
+  /**
+   * Create an instance of ModelList given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelList
+   * @throws IOException if the JSON string is invalid with respect to ModelList
+   */
   public static ModelList fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelList.class);
   }
 
- /**
-  * Convert an instance of ModelList to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelList to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
index f1d5a61ef299..7fd0bc415096 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -63,10 +63,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getReturn() {
     return _return;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelReturn
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelReturn
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelReturn.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -261,22 +261,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelReturn given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelReturn
-  * @throws IOException if the JSON string is invalid with respect to ModelReturn
-  */
+  /**
+   * Create an instance of ModelReturn given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelReturn
+   * @throws IOException if the JSON string is invalid with respect to ModelReturn
+   */
   public static ModelReturn fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelReturn.class);
   }
 
- /**
-  * Convert an instance of ModelReturn to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelReturn to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelWithOneOfAnyOfProperties.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelWithOneOfAnyOfProperties.java
index bda9aaf9509d..c9ff15febb1c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelWithOneOfAnyOfProperties.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelWithOneOfAnyOfProperties.java
@@ -69,10 +69,10 @@ public ModelWithOneOfAnyOfProperties oneofProp(ArrayOneOf oneofProp) {
     return this;
   }
 
-   /**
+  /**
    * Get oneofProp
    * @return oneofProp
-  **/
+   */
   @javax.annotation.Nullable
   public ArrayOneOf getOneofProp() {
     return oneofProp;
@@ -88,10 +88,10 @@ public ModelWithOneOfAnyOfProperties anyofProp(ArrayAnyOf anyofProp) {
     return this;
   }
 
-   /**
+  /**
    * Get anyofProp
    * @return anyofProp
-  **/
+   */
   @javax.annotation.Nullable
   public ArrayAnyOf getAnyofProp() {
     return anyofProp;
@@ -202,12 +202,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ModelWithOneOfAnyOfProperties
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ModelWithOneOfAnyOfProperties
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ModelWithOneOfAnyOfProperties.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -297,22 +297,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ModelWithOneOfAnyOfProperties given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ModelWithOneOfAnyOfProperties
-  * @throws IOException if the JSON string is invalid with respect to ModelWithOneOfAnyOfProperties
-  */
+  /**
+   * Create an instance of ModelWithOneOfAnyOfProperties given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ModelWithOneOfAnyOfProperties
+   * @throws IOException if the JSON string is invalid with respect to ModelWithOneOfAnyOfProperties
+   */
   public static ModelWithOneOfAnyOfProperties fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ModelWithOneOfAnyOfProperties.class);
   }
 
- /**
-  * Convert an instance of ModelWithOneOfAnyOfProperties to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ModelWithOneOfAnyOfProperties to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
index e0ea56393ffa..2174cfa7eace 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
@@ -84,10 +84,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public Integer getName() {
     return name;
@@ -98,10 +98,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getSnakeCase() {
     return snakeCase;
@@ -114,10 +114,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   public String getProperty() {
     return property;
@@ -128,10 +128,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   public Integer get123number() {
     return _123number;
@@ -246,12 +246,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Name
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Name
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Name.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -343,22 +343,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Name given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Name
-  * @throws IOException if the JSON string is invalid with respect to Name
-  */
+  /**
+   * Create an instance of Name given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Name
+   * @throws IOException if the JSON string is invalid with respect to Name
+   */
   public static Name fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Name.class);
   }
 
- /**
-  * Convert an instance of Name to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Name to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java
index 40a0a6f8bc81..fa28e27b4b62 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPet.java
@@ -146,10 +146,10 @@ public NewPet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -165,10 +165,10 @@ public NewPet categoryInlineAllof(NewPetCategoryInlineAllof categoryInlineAllof)
     return this;
   }
 
-   /**
+  /**
    * Get categoryInlineAllof
    * @return categoryInlineAllof
-  **/
+   */
   @javax.annotation.Nullable
   public NewPetCategoryInlineAllof getCategoryInlineAllof() {
     return categoryInlineAllof;
@@ -184,10 +184,10 @@ public NewPet categoryAllOfRef(Category categoryAllOfRef) {
     return this;
   }
 
-   /**
+  /**
    * Get categoryAllOfRef
    * @return categoryAllOfRef
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategoryAllOfRef() {
     return categoryAllOfRef;
@@ -203,10 +203,10 @@ public NewPet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -230,10 +230,10 @@ public NewPet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -257,10 +257,10 @@ public NewPet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -276,10 +276,10 @@ public NewPet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -407,12 +407,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NewPet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NewPet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NewPet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -539,22 +539,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of NewPet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NewPet
-  * @throws IOException if the JSON string is invalid with respect to NewPet
-  */
+  /**
+   * Create an instance of NewPet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NewPet
+   * @throws IOException if the JSON string is invalid with respect to NewPet
+   */
   public static NewPet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NewPet.class);
   }
 
- /**
-  * Convert an instance of NewPet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NewPet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllof.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllof.java
index f37520273705..ddccc9a51ec3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllof.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllof.java
@@ -72,10 +72,10 @@ public NewPetCategoryInlineAllof id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -91,10 +91,10 @@ public NewPetCategoryInlineAllof name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -110,10 +110,10 @@ public NewPetCategoryInlineAllof categoryTag(NewPetCategoryInlineAllofAllOfCateg
     return this;
   }
 
-   /**
+  /**
    * Get categoryTag
    * @return categoryTag
-  **/
+   */
   @javax.annotation.Nullable
   public NewPetCategoryInlineAllofAllOfCategoryTag getCategoryTag() {
     return categoryTag;
@@ -228,12 +228,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("name");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NewPetCategoryInlineAllof
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NewPetCategoryInlineAllof
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NewPetCategoryInlineAllof.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -329,22 +329,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of NewPetCategoryInlineAllof given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NewPetCategoryInlineAllof
-  * @throws IOException if the JSON string is invalid with respect to NewPetCategoryInlineAllof
-  */
+  /**
+   * Create an instance of NewPetCategoryInlineAllof given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NewPetCategoryInlineAllof
+   * @throws IOException if the JSON string is invalid with respect to NewPetCategoryInlineAllof
+   */
   public static NewPetCategoryInlineAllof fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NewPetCategoryInlineAllof.class);
   }
 
- /**
-  * Convert an instance of NewPetCategoryInlineAllof to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NewPetCategoryInlineAllof to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllofAllOfCategoryTag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllofAllOfCategoryTag.java
index 27e396befdfc..ae7f050e8368 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllofAllOfCategoryTag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllofAllOfCategoryTag.java
@@ -67,10 +67,10 @@ public NewPetCategoryInlineAllofAllOfCategoryTag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public NewPetCategoryInlineAllofAllOfCategoryTag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NewPetCategoryInlineAllofAllOfCategoryTag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NewPetCategoryInlineAllofAllOfCategoryTag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NewPetCategoryInlineAllofAllOfCategoryTag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of NewPetCategoryInlineAllofAllOfCategoryTag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NewPetCategoryInlineAllofAllOfCategoryTag
-  * @throws IOException if the JSON string is invalid with respect to NewPetCategoryInlineAllofAllOfCategoryTag
-  */
+  /**
+   * Create an instance of NewPetCategoryInlineAllofAllOfCategoryTag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NewPetCategoryInlineAllofAllOfCategoryTag
+   * @throws IOException if the JSON string is invalid with respect to NewPetCategoryInlineAllofAllOfCategoryTag
+   */
   public static NewPetCategoryInlineAllofAllOfCategoryTag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NewPetCategoryInlineAllofAllOfCategoryTag.class);
   }
 
- /**
-  * Convert an instance of NewPetCategoryInlineAllofAllOfCategoryTag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NewPetCategoryInlineAllofAllOfCategoryTag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 6dc916b82656..2e20d23ff222 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
@@ -115,10 +115,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getIntegerProp() {
     return integerProp;
@@ -134,10 +134,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getNumberProp() {
     return numberProp;
@@ -153,10 +153,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getBooleanProp() {
     return booleanProp;
@@ -172,10 +172,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   public String getStringProp() {
     return stringProp;
@@ -191,10 +191,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   public LocalDate getDateProp() {
     return dateProp;
@@ -210,10 +210,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getDatetimeProp() {
     return datetimeProp;
@@ -237,10 +237,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   public List<Object> getArrayNullableProp() {
     return arrayNullableProp;
@@ -264,10 +264,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   public List<Object> getArrayAndItemsNullableProp() {
     return arrayAndItemsNullableProp;
@@ -291,10 +291,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   public List<Object> getArrayItemsNullable() {
     return arrayItemsNullable;
@@ -318,10 +318,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Object> getObjectNullableProp() {
     return objectNullableProp;
@@ -345,10 +345,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Object> getObjectAndItemsNullableProp() {
     return objectAndItemsNullableProp;
@@ -372,10 +372,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   public Map<String, Object> getObjectItemsNullable() {
     return objectItemsNullable;
@@ -527,12 +527,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NullableClass
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NullableClass
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NullableClass.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -629,22 +629,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of NullableClass given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NullableClass
-  * @throws IOException if the JSON string is invalid with respect to NullableClass
-  */
+  /**
+   * Create an instance of NullableClass given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NullableClass
+   * @throws IOException if the JSON string is invalid with respect to NullableClass
+   */
   public static NullableClass fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NullableClass.class);
   }
 
- /**
-  * Convert an instance of NullableClass to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NullableClass to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
index 88eb0c0fae2d..ffee76b53c6c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -64,10 +64,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getJustNumber() {
     return justNumber;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to NumberOnly
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to NumberOnly
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!NumberOnly.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -262,22 +262,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of NumberOnly given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of NumberOnly
-  * @throws IOException if the JSON string is invalid with respect to NumberOnly
-  */
+  /**
+   * Create an instance of NumberOnly given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of NumberOnly
+   * @throws IOException if the JSON string is invalid with respect to NumberOnly
+   */
   public static NumberOnly fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, NumberOnly.class);
   }
 
- /**
-  * Convert an instance of NumberOnly to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of NumberOnly to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(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 24bf6f2f67ef..b7c088152b29 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
@@ -82,10 +82,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   public String getUuid() {
     return uuid;
@@ -102,11 +102,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public BigDecimal getId() {
@@ -125,11 +125,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public DeprecatedObject getDeprecatedRef() {
@@ -156,11 +156,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   public List<String> getBars() {
@@ -279,12 +279,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ObjectWithDeprecatedFields
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ObjectWithDeprecatedFields
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ObjectWithDeprecatedFields.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -377,22 +377,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ObjectWithDeprecatedFields given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ObjectWithDeprecatedFields
-  * @throws IOException if the JSON string is invalid with respect to ObjectWithDeprecatedFields
-  */
+  /**
+   * Create an instance of ObjectWithDeprecatedFields given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ObjectWithDeprecatedFields
+   * @throws IOException if the JSON string is invalid with respect to ObjectWithDeprecatedFields
+   */
   public static ObjectWithDeprecatedFields fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ObjectWithDeprecatedFields.class);
   }
 
- /**
-  * Convert an instance of ObjectWithDeprecatedFields to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ObjectWithDeprecatedFields to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
index 0a4685c0632d..d6574a26c576 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
@@ -138,10 +138,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -157,10 +157,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   public Long getPetId() {
     return petId;
@@ -176,10 +176,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getQuantity() {
     return quantity;
@@ -195,10 +195,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getComplete() {
     return complete;
@@ -359,12 +359,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Order
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Order
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Order.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -453,22 +453,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Order given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Order
-  * @throws IOException if the JSON string is invalid with respect to Order
-  */
+  /**
+   * Create an instance of Order given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Order
+   * @throws IOException if the JSON string is invalid with respect to Order
+   */
   public static Order fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Order.class);
   }
 
- /**
-  * Convert an instance of Order to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Order to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e561abdf943..4129f116f946 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -72,10 +72,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -91,10 +91,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   public String getMyString() {
     return myString;
@@ -110,10 +110,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getMyBoolean() {
     return myBoolean;
@@ -227,12 +227,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to OuterComposite
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to OuterComposite
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!OuterComposite.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -317,22 +317,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of OuterComposite given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of OuterComposite
-  * @throws IOException if the JSON string is invalid with respect to OuterComposite
-  */
+  /**
+   * Create an instance of OuterComposite given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of OuterComposite
+   * @throws IOException if the JSON string is invalid with respect to OuterComposite
+   */
   public static OuterComposite fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, OuterComposite.class);
   }
 
- /**
-  * Convert an instance of OuterComposite to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of OuterComposite to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java
index 7a661b2eb01d..3ef6b736cfa1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ParentPet.java
@@ -152,12 +152,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("pet_type");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ParentPet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ParentPet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ParentPet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -245,22 +245,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ParentPet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ParentPet
-  * @throws IOException if the JSON string is invalid with respect to ParentPet
-  */
+  /**
+   * Create an instance of ParentPet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ParentPet
+   * @throws IOException if the JSON string is invalid with respect to ParentPet
+   */
   public static ParentPet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ParentPet.class);
   }
 
- /**
-  * Convert an instance of ParentPet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ParentPet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
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 0d42bff17f37..9d81b9be83ad 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
@@ -141,10 +141,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -160,10 +160,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -179,10 +179,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -206,10 +206,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -233,10 +233,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -252,10 +252,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -380,12 +380,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Pet
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Pet
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Pet.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -508,22 +508,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Pet given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Pet
-  * @throws IOException if the JSON string is invalid with respect to Pet
-  */
+  /**
+   * Create an instance of Pet given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Pet
+   * @throws IOException if the JSON string is invalid with respect to Pet
+   */
   public static Pet fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Pet.class);
   }
 
- /**
-  * Convert an instance of Pet to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Pet to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java
index ec61e2206a95..3f8cdee6f982 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetComposition.java
@@ -141,10 +141,10 @@ public PetComposition id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -160,10 +160,10 @@ public PetComposition category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -179,10 +179,10 @@ public PetComposition name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -206,10 +206,10 @@ public PetComposition addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -233,10 +233,10 @@ public PetComposition addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -252,10 +252,10 @@ public PetComposition status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -380,12 +380,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to PetComposition
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to PetComposition
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!PetComposition.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -508,22 +508,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of PetComposition given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of PetComposition
-  * @throws IOException if the JSON string is invalid with respect to PetComposition
-  */
+  /**
+   * Create an instance of PetComposition given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of PetComposition
+   * @throws IOException if the JSON string is invalid with respect to PetComposition
+   */
   public static PetComposition fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, PetComposition.class);
   }
 
- /**
-  * Convert an instance of PetComposition to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of PetComposition to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java
index cc566a89f5b6..5d972266c935 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetRef.java
@@ -141,10 +141,10 @@ public PetRef id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -160,10 +160,10 @@ public PetRef category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -179,10 +179,10 @@ public PetRef name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -206,10 +206,10 @@ public PetRef addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -233,10 +233,10 @@ public PetRef addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -252,10 +252,10 @@ public PetRef status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -380,12 +380,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to PetRef
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to PetRef
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!PetRef.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -508,22 +508,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of PetRef given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of PetRef
-  * @throws IOException if the JSON string is invalid with respect to PetRef
-  */
+  /**
+   * Create an instance of PetRef given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of PetRef
+   * @throws IOException if the JSON string is invalid with respect to PetRef
+   */
   public static PetRef fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, PetRef.class);
   }
 
- /**
-  * Convert an instance of PetRef to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of PetRef to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java
index 2b8629e047e0..109e13191710 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetUsingAllOf.java
@@ -141,10 +141,10 @@ public PetUsingAllOf id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -160,10 +160,10 @@ public PetUsingAllOf category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * multi line description 2nd line last line 
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -179,10 +179,10 @@ public PetUsingAllOf name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -206,10 +206,10 @@ public PetUsingAllOf addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -233,10 +233,10 @@ public PetUsingAllOf addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   public List<Tag> getTags() {
     return tags;
@@ -252,10 +252,10 @@ public PetUsingAllOf status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -380,12 +380,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("photoUrls");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to PetUsingAllOf
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to PetUsingAllOf
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!PetUsingAllOf.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -508,22 +508,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of PetUsingAllOf given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of PetUsingAllOf
-  * @throws IOException if the JSON string is invalid with respect to PetUsingAllOf
-  */
+  /**
+   * Create an instance of PetUsingAllOf given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of PetUsingAllOf
+   * @throws IOException if the JSON string is invalid with respect to PetUsingAllOf
+   */
   public static PetUsingAllOf fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, PetUsingAllOf.class);
   }
 
- /**
-  * Convert an instance of PetUsingAllOf to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of PetUsingAllOf to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
index a5450400a463..45f6682ebaa1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PetWithRequiredTags.java
@@ -141,10 +141,10 @@ public PetWithRequiredTags id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -160,10 +160,10 @@ public PetWithRequiredTags category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   public Category getCategory() {
     return category;
@@ -179,10 +179,10 @@ public PetWithRequiredTags name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -206,10 +206,10 @@ public PetWithRequiredTags addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -233,10 +233,10 @@ public PetWithRequiredTags addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nonnull
   public List<Tag> getTags() {
     return tags;
@@ -252,10 +252,10 @@ public PetWithRequiredTags status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   public StatusEnum getStatus() {
     return status;
@@ -381,12 +381,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("tags");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to PetWithRequiredTags
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to PetWithRequiredTags
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!PetWithRequiredTags.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -505,22 +505,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of PetWithRequiredTags given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of PetWithRequiredTags
-  * @throws IOException if the JSON string is invalid with respect to PetWithRequiredTags
-  */
+  /**
+   * Create an instance of PetWithRequiredTags given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of PetWithRequiredTags
+   * @throws IOException if the JSON string is invalid with respect to PetWithRequiredTags
+   */
   public static PetWithRequiredTags fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, PetWithRequiredTags.class);
   }
 
- /**
-  * Convert an instance of PetWithRequiredTags to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of PetWithRequiredTags to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PropertyNameCollision.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PropertyNameCollision.java
index 93990caedb07..c0f6b1564772 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PropertyNameCollision.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/PropertyNameCollision.java
@@ -71,10 +71,10 @@ public PropertyNameCollision underscoreType(String underscoreType) {
     return this;
   }
 
-   /**
+  /**
    * Get underscoreType
    * @return underscoreType
-  **/
+   */
   @javax.annotation.Nullable
   public String getUnderscoreType() {
     return underscoreType;
@@ -90,10 +90,10 @@ public PropertyNameCollision type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public String getType() {
     return type;
@@ -109,10 +109,10 @@ public PropertyNameCollision typeWithUnderscore(String typeWithUnderscore) {
     return this;
   }
 
-   /**
+  /**
    * Get typeWithUnderscore
    * @return typeWithUnderscore
-  **/
+   */
   @javax.annotation.Nullable
   public String getTypeWithUnderscore() {
     return typeWithUnderscore;
@@ -226,12 +226,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to PropertyNameCollision
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to PropertyNameCollision
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!PropertyNameCollision.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -322,22 +322,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of PropertyNameCollision given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of PropertyNameCollision
-  * @throws IOException if the JSON string is invalid with respect to PropertyNameCollision
-  */
+  /**
+   * Create an instance of PropertyNameCollision given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of PropertyNameCollision
+   * @throws IOException if the JSON string is invalid with respect to PropertyNameCollision
+   */
   public static PropertyNameCollision fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, PropertyNameCollision.class);
   }
 
- /**
-  * Convert an instance of PropertyNameCollision to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of PropertyNameCollision to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
index 8407e0e50d9f..7fe9dad0c8cc 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
@@ -63,10 +63,10 @@ public QuadrilateralInterface quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getQuadrilateralType() {
     return quadrilateralType;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("quadrilateralType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to QuadrilateralInterface
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to QuadrilateralInterface
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!QuadrilateralInterface.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -272,22 +272,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of QuadrilateralInterface given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of QuadrilateralInterface
-  * @throws IOException if the JSON string is invalid with respect to QuadrilateralInterface
-  */
+  /**
+   * Create an instance of QuadrilateralInterface given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of QuadrilateralInterface
+   * @throws IOException if the JSON string is invalid with respect to QuadrilateralInterface
+   */
   public static QuadrilateralInterface fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, QuadrilateralInterface.class);
   }
 
- /**
-  * Convert an instance of QuadrilateralInterface to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of QuadrilateralInterface to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a88b720df7a0..5c0a6f4e10a8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -69,10 +69,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   public String getBar() {
     return bar;
@@ -85,10 +85,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   public String getBaz() {
     return baz;
@@ -199,12 +199,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ReadOnlyFirst
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ReadOnlyFirst
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ReadOnlyFirst.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -292,22 +292,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ReadOnlyFirst given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ReadOnlyFirst
-  * @throws IOException if the JSON string is invalid with respect to ReadOnlyFirst
-  */
+  /**
+   * Create an instance of ReadOnlyFirst given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ReadOnlyFirst
+   * @throws IOException if the JSON string is invalid with respect to ReadOnlyFirst
+   */
   public static ReadOnlyFirst fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ReadOnlyFirst.class);
   }
 
- /**
-  * Convert an instance of ReadOnlyFirst to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ReadOnlyFirst to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
index a9e3130a98b7..90a6fd3aeb98 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -67,10 +67,10 @@ public ScaleneTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getShapeType() {
     return shapeType;
@@ -86,10 +86,10 @@ public ScaleneTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getTriangleType() {
     return triangleType;
@@ -202,12 +202,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("triangleType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ScaleneTriangle
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ScaleneTriangle
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ScaleneTriangle.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -302,22 +302,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ScaleneTriangle given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ScaleneTriangle
-  * @throws IOException if the JSON string is invalid with respect to ScaleneTriangle
-  */
+  /**
+   * Create an instance of ScaleneTriangle given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ScaleneTriangle
+   * @throws IOException if the JSON string is invalid with respect to ScaleneTriangle
+   */
   public static ScaleneTriangle fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ScaleneTriangle.class);
   }
 
- /**
-  * Convert an instance of ScaleneTriangle to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ScaleneTriangle to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java
index 2ddb33216134..5f9eaa6e6ba7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ShapeInterface.java
@@ -63,10 +63,10 @@ public ShapeInterface shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getShapeType() {
     return shapeType;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("shapeType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to ShapeInterface
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to ShapeInterface
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!ShapeInterface.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -272,22 +272,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of ShapeInterface given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of ShapeInterface
-  * @throws IOException if the JSON string is invalid with respect to ShapeInterface
-  */
+  /**
+   * Create an instance of ShapeInterface given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of ShapeInterface
+   * @throws IOException if the JSON string is invalid with respect to ShapeInterface
+   */
   public static ShapeInterface fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, ShapeInterface.class);
   }
 
- /**
-  * Convert an instance of ShapeInterface to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of ShapeInterface to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
index 9a432293cb23..597ca87b984a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
@@ -67,10 +67,10 @@ public SimpleQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getShapeType() {
     return shapeType;
@@ -86,10 +86,10 @@ public SimpleQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getQuadrilateralType() {
     return quadrilateralType;
@@ -202,12 +202,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("quadrilateralType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to SimpleQuadrilateral
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to SimpleQuadrilateral
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!SimpleQuadrilateral.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -302,22 +302,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of SimpleQuadrilateral given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of SimpleQuadrilateral
-  * @throws IOException if the JSON string is invalid with respect to SimpleQuadrilateral
-  */
+  /**
+   * Create an instance of SimpleQuadrilateral given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of SimpleQuadrilateral
+   * @throws IOException if the JSON string is invalid with respect to SimpleQuadrilateral
+   */
   public static SimpleQuadrilateral fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, SimpleQuadrilateral.class);
   }
 
- /**
-  * Convert an instance of SimpleQuadrilateral to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of SimpleQuadrilateral to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 25379355bbbc..06ca8214584f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -67,10 +67,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
@@ -86,10 +86,10 @@ public SpecialModelName specialModelName(String specialModelName) {
     return this;
   }
 
-   /**
+  /**
    * Get specialModelName
    * @return specialModelName
-  **/
+   */
   @javax.annotation.Nullable
   public String getSpecialModelName() {
     return specialModelName;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to SpecialModelName
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to SpecialModelName
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!SpecialModelName.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of SpecialModelName given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of SpecialModelName
-  * @throws IOException if the JSON string is invalid with respect to SpecialModelName
-  */
+  /**
+   * Create an instance of SpecialModelName given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of SpecialModelName
+   * @throws IOException if the JSON string is invalid with respect to SpecialModelName
+   */
   public static SpecialModelName fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, SpecialModelName.class);
   }
 
- /**
-  * Convert an instance of SpecialModelName to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of SpecialModelName to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
index 56a38a94ac16..6079beff25f7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -67,10 +67,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -86,10 +86,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   public String getName() {
     return name;
@@ -200,12 +200,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Tag
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Tag
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Tag.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -290,22 +290,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Tag given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Tag
-  * @throws IOException if the JSON string is invalid with respect to Tag
-  */
+  /**
+   * Create an instance of Tag given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Tag
+   * @throws IOException if the JSON string is invalid with respect to Tag
+   */
   public static Tag fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Tag.class);
   }
 
- /**
-  * Convert an instance of Tag to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Tag to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index 9c3fef28140f..d8ecf3e595aa 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -63,10 +63,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   public String getSomeProperty() {
     return someProperty;
@@ -174,12 +174,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TestInlineFreeformAdditionalPropertiesRequest
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TestInlineFreeformAdditionalPropertiesRequest
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TestInlineFreeformAdditionalPropertiesRequest.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -264,22 +264,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of TestInlineFreeformAdditionalPropertiesRequest given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TestInlineFreeformAdditionalPropertiesRequest
-  * @throws IOException if the JSON string is invalid with respect to TestInlineFreeformAdditionalPropertiesRequest
-  */
+  /**
+   * Create an instance of TestInlineFreeformAdditionalPropertiesRequest given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TestInlineFreeformAdditionalPropertiesRequest
+   * @throws IOException if the JSON string is invalid with respect to TestInlineFreeformAdditionalPropertiesRequest
+   */
   public static TestInlineFreeformAdditionalPropertiesRequest fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TestInlineFreeformAdditionalPropertiesRequest.class);
   }
 
- /**
-  * Convert an instance of TestInlineFreeformAdditionalPropertiesRequest to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TestInlineFreeformAdditionalPropertiesRequest to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java
index 3dc9b7b92ec5..57c96e16982b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TriangleInterface.java
@@ -63,10 +63,10 @@ public TriangleInterface triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   public String getTriangleType() {
     return triangleType;
@@ -175,12 +175,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("triangleType");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to TriangleInterface
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to TriangleInterface
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!TriangleInterface.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -272,22 +272,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of TriangleInterface given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of TriangleInterface
-  * @throws IOException if the JSON string is invalid with respect to TriangleInterface
-  */
+  /**
+   * Create an instance of TriangleInterface given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of TriangleInterface
+   * @throws IOException if the JSON string is invalid with respect to TriangleInterface
+   */
   public static TriangleInterface fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, TriangleInterface.class);
   }
 
- /**
-  * Convert an instance of TriangleInterface to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of TriangleInterface to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
index 3879185a55f4..87fcf2d563fe 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
@@ -108,10 +108,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   public Long getId() {
     return id;
@@ -127,10 +127,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   public String getUsername() {
     return username;
@@ -146,10 +146,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   public String getFirstName() {
     return firstName;
@@ -165,10 +165,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   public String getLastName() {
     return lastName;
@@ -184,10 +184,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   public String getEmail() {
     return email;
@@ -203,10 +203,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   public String getPassword() {
     return password;
@@ -222,10 +222,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   public String getPhone() {
     return phone;
@@ -241,10 +241,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   public Integer getUserStatus() {
     return userStatus;
@@ -260,10 +260,10 @@ public User objectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
    * @return objectWithNoDeclaredProps
-  **/
+   */
   @javax.annotation.Nullable
   public Object getObjectWithNoDeclaredProps() {
     return objectWithNoDeclaredProps;
@@ -279,10 +279,10 @@ public User objectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNu
     return this;
   }
 
-   /**
+  /**
    * test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
    * @return objectWithNoDeclaredPropsNullable
-  **/
+   */
   @javax.annotation.Nullable
   public Object getObjectWithNoDeclaredPropsNullable() {
     return objectWithNoDeclaredPropsNullable;
@@ -298,10 +298,10 @@ public User anyTypeProp(Object anyTypeProp) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
    * @return anyTypeProp
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnyTypeProp() {
     return anyTypeProp;
@@ -317,10 +317,10 @@ public User anyTypePropNullable(Object anyTypePropNullable) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.
    * @return anyTypePropNullable
-  **/
+   */
   @javax.annotation.Nullable
   public Object getAnyTypePropNullable() {
     return anyTypePropNullable;
@@ -472,12 +472,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields = new HashSet<String>();
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to User
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to User
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!User.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -577,22 +577,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of User given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of User
-  * @throws IOException if the JSON string is invalid with respect to User
-  */
+  /**
+   * Create an instance of User given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of User
+   * @throws IOException if the JSON string is invalid with respect to User
+   */
   public static User fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, User.class);
   }
 
- /**
-  * Convert an instance of User to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of User to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Variable.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Variable.java
index 68cf8635344d..6c1175d1e5ee 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Variable.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Variable.java
@@ -68,10 +68,10 @@ public Variable name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   public String getName() {
     return name;
@@ -87,10 +87,10 @@ public Variable value(Value value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   public Value getValue() {
     return value;
@@ -203,12 +203,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("value");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Variable
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Variable
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Variable.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -302,22 +302,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Variable given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Variable
-  * @throws IOException if the JSON string is invalid with respect to Variable
-  */
+  /**
+   * Create an instance of Variable given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Variable
+   * @throws IOException if the JSON string is invalid with respect to Variable
+   */
   public static Variable fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Variable.class);
   }
 
- /**
-  * Convert an instance of Variable to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Variable to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java
index 0aea7fcaadd8..a247a4f982c0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Whale.java
@@ -71,10 +71,10 @@ public Whale hasBaleen(Boolean hasBaleen) {
     return this;
   }
 
-   /**
+  /**
    * Get hasBaleen
    * @return hasBaleen
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getHasBaleen() {
     return hasBaleen;
@@ -90,10 +90,10 @@ public Whale hasTeeth(Boolean hasTeeth) {
     return this;
   }
 
-   /**
+  /**
    * Get hasTeeth
    * @return hasTeeth
-  **/
+   */
   @javax.annotation.Nullable
   public Boolean getHasTeeth() {
     return hasTeeth;
@@ -109,10 +109,10 @@ public Whale className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -227,12 +227,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Whale
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Whale
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Whale.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -324,22 +324,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Whale given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Whale
-  * @throws IOException if the JSON string is invalid with respect to Whale
-  */
+  /**
+   * Create an instance of Whale given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Whale
+   * @throws IOException if the JSON string is invalid with respect to Whale
+   */
   public static Whale fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Whale.class);
   }
 
- /**
-  * Convert an instance of Whale to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Whale to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
index 5e39ba61287c..95294d19a2e4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Zebra.java
@@ -121,10 +121,10 @@ public Zebra type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   public TypeEnum getType() {
     return type;
@@ -140,10 +140,10 @@ public Zebra className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   public String getClassName() {
     return className;
@@ -255,12 +255,12 @@ private String toIndentedString(Object o) {
     openapiRequiredFields.add("className");
   }
 
- /**
-  * Validates the JSON Element and throws an exception if issues found
-  *
-  * @param jsonElement JSON Element
-  * @throws IOException if the JSON Element is invalid with respect to Zebra
-  */
+  /**
+   * Validates the JSON Element and throws an exception if issues found
+   *
+   * @param jsonElement JSON Element
+   * @throws IOException if the JSON Element is invalid with respect to Zebra
+   */
   public static void validateJsonElement(JsonElement jsonElement) throws IOException {
       if (jsonElement == null) {
         if (!Zebra.openapiRequiredFields.isEmpty()) { // has required fields but JSON element is null
@@ -359,22 +359,22 @@ else if (entry.getValue().getAsJsonPrimitive().isBoolean())
     }
   }
 
- /**
-  * Create an instance of Zebra given an JSON string
-  *
-  * @param jsonString JSON string
-  * @return An instance of Zebra
-  * @throws IOException if the JSON string is invalid with respect to Zebra
-  */
+  /**
+   * Create an instance of Zebra given an JSON string
+   *
+   * @param jsonString JSON string
+   * @return An instance of Zebra
+   * @throws IOException if the JSON string is invalid with respect to Zebra
+   */
   public static Zebra fromJson(String jsonString) throws IOException {
     return JSON.getGson().fromJson(jsonString, Zebra.class);
   }
 
- /**
-  * Convert an instance of Zebra to an JSON string
-  *
-  * @return JSON string
-  */
+  /**
+   * Convert an instance of Zebra to an JSON string
+   *
+   * @return JSON string
+   */
   public String toJson() {
     return JSON.getGson().toJson(this);
   }
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index c003d64d6681..12f9e9195392 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index bedf82ac5edf..e898d339fe3c 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a87609c5aae8..48fb65750497 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 04f365b3f394..ca9d8ef2b3f1 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -98,10 +98,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
@@ -132,10 +132,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -167,10 +167,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
@@ -201,10 +201,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
@@ -235,10 +235,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -270,10 +270,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -305,10 +305,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -340,10 +340,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -367,10 +367,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ANYTYPE1)
@@ -393,10 +393,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ANYTYPE2)
@@ -419,10 +419,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ANYTYPE3)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index b9658b524826..26953f937c7d 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 825a0e4a6592..226a40ea79cb 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -50,10 +50,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index f565ef097589..585e9aa09b07 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 4b1efc20d758..da97aaf849e5 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java
index e7e46ea416ad..533870a5d3e9 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Animal.java
@@ -64,10 +64,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -91,10 +91,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_COLOR)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 61153c222dcb..511c787493a6 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -58,10 +58,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index c43c11bf50c5..cd7565bd97cf 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -58,10 +58,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7edd8deea67a..01c64d05cc6a 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -66,10 +66,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
@@ -100,10 +100,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -135,10 +135,10 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java
index 0e6da5b0bd06..52d0611275f0 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/BigCat.java
@@ -96,10 +96,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_KIND)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java
index fba154abce8b..b60fc9ace92b 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -66,10 +66,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
@@ -92,10 +92,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
@@ -118,10 +118,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
@@ -144,10 +144,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
@@ -170,10 +170,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
@@ -196,10 +196,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java
index ec33456a7bb0..1b31d5159493 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Cat.java
@@ -60,10 +60,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java
index d9aebfefedb7..a94d4574d2ca 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Category.java
@@ -50,10 +50,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -76,10 +76,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java
index 8d0f59bba9f7..2741666481e4 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -46,10 +46,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java
index faff1be581e6..cb521eb70573 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Client.java
@@ -46,10 +46,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java
index ae00092459d3..d0f772e41b7e 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Dog.java
@@ -57,10 +57,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
index bcbd51ba83a0..aafc69878c1a 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -123,10 +123,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
@@ -157,10 +157,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
index 56bcd36dc387..d40d022e4912 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -208,10 +208,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
@@ -234,10 +234,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -261,10 +261,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
@@ -287,10 +287,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
@@ -313,10 +313,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index e32235c8955d..6145fb136f88 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -54,10 +54,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -89,10 +89,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
index fb787df49a98..0caecff27033 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -104,12 +104,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
  @Min(10) @Max(100)
   @JsonProperty(JSON_PROPERTY_INTEGER)
@@ -132,12 +132,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
  @Min(20) @Max(200)
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -160,10 +160,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_INT64)
@@ -186,12 +186,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -216,12 +216,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
  @DecimalMin("54.3") @DecimalMax("987.6")
   @JsonProperty(JSON_PROPERTY_FLOAT)
@@ -244,12 +244,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
  @DecimalMin("67.8") @DecimalMax("123.4")
   @JsonProperty(JSON_PROPERTY_DOUBLE)
@@ -272,10 +272,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
   @JsonProperty(JSON_PROPERTY_STRING)
@@ -298,10 +298,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -325,10 +325,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -352,10 +352,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -380,10 +380,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -407,10 +407,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -434,10 +434,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
  @Size(min=10,max=64)
@@ -461,10 +461,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 81b8503aa57e..720339e87a4e 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -45,8 +45,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -57,10 +57,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -72,10 +72,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_FOO)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java
index 98fe28a5e354..401ebf688799 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -103,10 +103,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -138,10 +138,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
@@ -172,10 +172,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
@@ -206,10 +206,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 31a55efeba9a..297eecdb05fd 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -59,10 +59,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -86,10 +86,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -121,10 +121,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java
index 5de7fbd433f0..7e6e4b5b15d3 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -51,10 +51,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -77,10 +77,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 433e1bcf0582..329cbe3fd2f8 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -55,10 +55,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -81,10 +81,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -107,10 +107,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java
index c86e61cdeef2..76f0b31b677c 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -47,10 +47,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java
index b0a8675e46d3..4aa11d7ef85c 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelList.java
@@ -47,10 +47,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_123LIST)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java
index 5e1eb41842ee..127268015ffa 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -47,10 +47,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java
index 1634411587ff..31fe4236fc60 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Name.java
@@ -52,8 +52,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -70,10 +70,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -91,10 +91,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
@@ -112,10 +112,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY)
@@ -132,10 +132,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_123NUMBER)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java
index b0c47b22679a..92ad4f821fcc 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -47,10 +47,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java
index a418220504c4..cff34b3d0a09 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Order.java
@@ -104,10 +104,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -130,10 +130,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -156,10 +156,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -182,10 +182,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -209,10 +209,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -235,10 +235,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6cdfac80c003..4a6ff1010bb0 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -55,10 +55,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -82,10 +82,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MY_STRING)
@@ -108,10 +108,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java
index 09e4cb94364d..ca885ceb945f 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Pet.java
@@ -111,10 +111,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -137,10 +137,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -164,10 +164,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -199,10 +199,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -235,10 +235,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -262,10 +262,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_STATUS)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 2882281db581..99bf231e6486 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -44,8 +44,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -54,10 +54,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -75,10 +75,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAZ)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java
index d1393399a199..02c8a4a33061 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -47,10 +47,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java
index 61c28a9ddb07..1f889a20a721 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,10 +50,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -76,10 +76,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 3191441967c7..8ea7d413c505 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -66,10 +66,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -93,10 +93,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -121,10 +121,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -148,10 +148,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -183,10 +183,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 1e6163d8b765..9a4a86141710 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -70,10 +70,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -97,10 +97,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -125,10 +125,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -152,10 +152,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -179,10 +179,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -214,10 +214,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java
index b785ecf474ae..395d86786246 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/User.java
@@ -74,10 +74,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -100,10 +100,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -126,10 +126,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -152,10 +152,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -178,10 +178,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -204,10 +204,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -230,10 +230,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -256,10 +256,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java
index 3f81ea79caf4..5281d053045d 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -162,10 +162,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
@@ -188,10 +188,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -215,10 +215,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
@@ -241,10 +241,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
@@ -275,10 +275,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
@@ -301,10 +301,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_STRING)
@@ -327,10 +327,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -354,10 +354,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
@@ -380,10 +380,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
@@ -414,10 +414,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
@@ -448,10 +448,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
@@ -474,10 +474,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
@@ -500,10 +500,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -527,10 +527,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
@@ -553,10 +553,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
@@ -587,10 +587,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
@@ -621,10 +621,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
@@ -647,10 +647,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
@@ -673,10 +673,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -700,10 +700,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
@@ -726,10 +726,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
@@ -760,10 +760,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
@@ -794,10 +794,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
@@ -820,10 +820,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
@@ -846,10 +846,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -873,10 +873,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
@@ -899,10 +899,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
@@ -933,10 +933,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
@@ -967,10 +967,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index ebc95cc9f12f..7e2138d2d9af 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1e5621e255cc..99abeda10f5f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -47,10 +47,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 89e3fc15acbd..2879589123e1 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index ff12c670209a..a72399ad7651 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -95,10 +95,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -125,10 +125,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -156,10 +156,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -186,10 +186,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -216,10 +216,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -247,10 +247,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -278,10 +278,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -309,10 +309,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -332,10 +332,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -354,10 +354,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -376,10 +376,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 3a6507cd15bc..8861923aa61f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 544a198cdd6c..a0b8917c827f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -47,10 +47,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5adefdcca875..42f7d86cf54b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 6e5ee0d9d8cb..5318fb6ef3f7 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
index 9eb9e1720e8f..618f46230a79 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
@@ -47,10 +47,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -70,10 +70,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 85197a9e571d..db86c95f5057 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 5948eafd9dc6..804b8e84152d 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
index 658fe2b71858..22708f9642d4 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -93,10 +93,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -124,10 +124,10 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java
index b7b51c16596c..877ea6f0fef2 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/BigCat.java
@@ -96,10 +96,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
index 62eb0db10936..487c4d4f1b14 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -85,10 +85,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -107,10 +107,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -129,10 +129,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -151,10 +151,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -173,10 +173,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
index 03beabaae8ce..4a0a67e73d1c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
@@ -45,10 +45,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
index 8d1f7583d04e..c898f8d0996f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -69,10 +69,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
index 834df9fee969..2f0a813a4f85 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
index d4331424086c..f88e3e6d5446 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
index bc835351d92a..737d0447617c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
@@ -45,10 +45,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
index 417318c6ce07..1d17001afbe0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -144,10 +144,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -174,10 +174,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
index 18ddd4b6efb9..328ab16fbb46 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -252,10 +252,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -274,10 +274,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -297,10 +297,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -319,10 +319,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -341,10 +341,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 40f453e5a10d..fa4fa072836e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -82,10 +82,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
index 4f3d680ed2b6..6fa2e392a697 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -100,12 +100,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
  @Min(10) @Max(100)
 
@@ -124,12 +124,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
  @Min(20) @Max(200)
 
@@ -148,10 +148,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -170,12 +170,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -196,12 +196,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
  @DecimalMin("54.3") @DecimalMax("987.6")
 
@@ -220,12 +220,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
  @DecimalMin("67.8") @DecimalMax("123.4")
 
@@ -244,10 +244,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
 
@@ -266,10 +266,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -289,10 +289,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -312,10 +312,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -336,10 +336,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -359,10 +359,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -382,10 +382,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
  @Size(min=10,max=64)
@@ -405,10 +405,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 92b46ff2c801..853f412ca1e2 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,8 +41,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public HasOnlyReadOnly(
      String bar, 
@@ -53,10 +53,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -66,10 +66,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
index fec9152317ad..526afd3d197b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,10 +112,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -143,10 +143,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -173,10 +173,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -203,10 +203,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 5300240d8ac8..999d55520f71 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -79,10 +79,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -110,10 +110,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
index c272d2dd5f7b..d49889c62233 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,10 +47,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -69,10 +69,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 34524f0baa87..468b2cfea223 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -51,10 +51,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -73,10 +73,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -95,10 +95,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java
index 04b88b8403e8..b11f901c7311 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -43,10 +43,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java
index a49b77f1406b..5109ec8d66cb 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelList.java
@@ -43,10 +43,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
index 26b6f10504dd..26390c3a7825 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,10 +43,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
index 70ada343dd92..edf23f4e8a8b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public Name(
      Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -84,10 +84,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -103,10 +103,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -119,10 +119,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
index c2580165ae4c..13d7df289302 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
index 193513022a41..481b6fda441c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
@@ -113,10 +113,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -135,10 +135,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -157,10 +157,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -179,10 +179,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -202,10 +202,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -224,10 +224,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
index c8e949eea3a0..ac7d12def3ac 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -75,10 +75,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -97,10 +97,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
index d11dbcf08d03..8a3b933c0fc0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
@@ -119,10 +119,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -141,10 +141,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -164,10 +164,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -195,10 +195,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -226,10 +226,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -249,10 +249,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 9180c56b1ab1..7755185f1468 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public ReadOnlyFirst(
      String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -70,10 +70,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 107b610a9072..ecc71ceffcce 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -43,10 +43,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
index 529838937bb1..c64f617bec6f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -69,10 +69,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 820c65fdea52..51b50a408150 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -63,10 +63,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -86,10 +86,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -110,10 +110,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -133,10 +133,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -164,10 +164,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 1fa320541192..346201576cb4 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -67,10 +67,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -90,10 +90,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
   @Valid
@@ -114,10 +114,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -137,10 +137,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -160,10 +160,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
@@ -191,10 +191,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
index 7f56d15b0468..3c6102482856 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -93,10 +93,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -115,10 +115,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -137,10 +137,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -159,10 +159,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -181,10 +181,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -203,10 +203,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -225,10 +225,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
index 4accce695022..4bd4719e3563 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -159,10 +159,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -181,10 +181,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -204,10 +204,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -226,10 +226,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -256,10 +256,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -278,10 +278,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -300,10 +300,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -323,10 +323,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -345,10 +345,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -375,10 +375,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -405,10 +405,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -427,10 +427,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -449,10 +449,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -472,10 +472,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -494,10 +494,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -524,10 +524,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -554,10 +554,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -576,10 +576,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -598,10 +598,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -621,10 +621,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -643,10 +643,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -673,10 +673,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -703,10 +703,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -725,10 +725,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -747,10 +747,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Valid
 
@@ -770,10 +770,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -792,10 +792,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -822,10 +822,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
@@ -852,10 +852,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
 
diff --git a/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java b/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
index 577df29a8210..7482a892df36 100644
--- a/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
+++ b/samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
@@ -64,10 +64,10 @@ public ByteArrayObject nullableArray(byte[] nullableArray) {
     return this;
   }
 
-   /**
+  /**
    * byte array.
    * @return nullableArray
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -97,10 +97,10 @@ public ByteArrayObject normalArray(byte[] normalArray) {
     return this;
   }
 
-   /**
+  /**
    * byte array.
    * @return normalArray
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NORMAL_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -122,10 +122,10 @@ public ByteArrayObject nullableString(String nullableString) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableString
    * @return nullableString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -155,10 +155,10 @@ public ByteArrayObject stringField(String stringField) {
     return this;
   }
 
-   /**
+  /**
    * Get stringField
    * @return stringField
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING_FIELD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -180,10 +180,10 @@ public ByteArrayObject intField(BigDecimal intField) {
     return this;
   }
 
-   /**
+  /**
    * Get intField
    * @return intField
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT_FIELD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index cb43a79c1719..64e160f274c7 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -58,10 +58,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
@@ -92,10 +92,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 3d15fd9ed941..b724633edc69 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -49,10 +49,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -75,10 +75,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
index 278cb727fd7f..af105ee9b942 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
@@ -61,10 +61,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
@@ -87,10 +87,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_COLOR)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index b7410c2a5a12..c0457e6b21f0 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -56,10 +56,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 29040b36c2c8..fc7dbb096d90 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -56,10 +56,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 9fb24391e659..c0c4e9c9d3b5 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -64,10 +64,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
@@ -98,10 +98,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
@@ -132,10 +132,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java
index b9038849535f..3cb73e2d98cb 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -64,10 +64,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
@@ -90,10 +90,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
@@ -116,10 +116,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
@@ -142,10 +142,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
@@ -168,10 +168,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
@@ -194,10 +194,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Name of the pet ")
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java
index 00c51cb9e3fb..5c0a73fba7de 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java
@@ -55,10 +55,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Category.java
index d267f77f48c5..fe58819af0b0 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Category.java
@@ -48,10 +48,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -74,10 +74,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 4316838c917c..28acddb17ac4 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -56,10 +56,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java
index 73e67933167e..78681baab174 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -45,10 +45,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Client.java
index 0cf6e8734091..a13c1dcb55da 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Client.java
@@ -44,10 +44,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 2101a006cb23..eacea2525a04 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -46,10 +46,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java
index 51965628bc5e..54c2bf19606f 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java
@@ -55,10 +55,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 778dc4f49b95..dd67f5af657f 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -121,10 +121,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
@@ -155,10 +155,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
index cfad73c121f2..5c1c794f5e05 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -225,10 +225,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
@@ -251,10 +251,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
@@ -277,10 +277,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
@@ -303,10 +303,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
@@ -329,10 +329,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -363,10 +363,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
@@ -389,10 +389,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
@@ -415,10 +415,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index 7f6d36ccedf2..c75b946379a3 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -52,10 +52,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SOME_ID)
@@ -86,10 +86,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 11794582fb05..21638777aa50 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -52,10 +52,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FILE)
@@ -86,10 +86,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FILES)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java
index 56ed5c89d411..cf5a831e1486 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java
@@ -44,10 +44,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 8fcc372149ca..207c251d96db 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -46,10 +46,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_STRING)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
index e41c916a7531..8092fd11bf35 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -110,12 +110,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INTEGER)
@@ -138,12 +138,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -166,10 +166,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INT64)
@@ -192,12 +192,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NUMBER)
@@ -220,12 +220,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FLOAT)
@@ -248,12 +248,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DOUBLE)
@@ -276,10 +276,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DECIMAL)
@@ -302,10 +302,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_STRING)
@@ -328,10 +328,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BYTE)
@@ -354,10 +354,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BINARY)
@@ -380,10 +380,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DATE)
@@ -406,10 +406,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
@@ -432,10 +432,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -458,10 +458,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -484,10 +484,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "A string that is a 10 digit number. Can have leading zeros.")
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
@@ -510,10 +510,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.")
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4eb3d31e21df..02d1e973371b 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -43,8 +43,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -55,10 +55,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -70,10 +70,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FOO)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 9a61aa266d01..c211ee3a14fd 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -49,10 +49,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java
index acf5711e3338..f7162f564cd5 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -101,10 +101,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
@@ -135,10 +135,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
@@ -169,10 +169,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
@@ -203,10 +203,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 55c2ca6ad909..d5ea2cca9ba8 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -83,10 +83,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
@@ -117,10 +117,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java
index 9bfcf455dda3..c7a0904bc3d1 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -50,10 +50,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -76,10 +76,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b85f95d21ac1..29795bbc8251 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -53,10 +53,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -79,10 +79,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -105,10 +105,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java
index bd9b3893b406..ec73faa3684c 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -46,10 +46,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Test capitalization")
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java
index a29fa46c6998..394d6a48ae2f 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java
@@ -45,10 +45,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_123LIST)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 059f9e40499a..bae3b39ef753 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,10 +46,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Name.java
index 07254fb85c5d..d1fdbeeab9c4 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Name.java
@@ -51,8 +51,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -69,10 +69,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -89,10 +89,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
@@ -110,10 +110,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PROPERTY)
@@ -130,10 +130,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_123NUMBER)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java
index 272e76c39354..befc8f34b697 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -101,10 +101,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -135,10 +135,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -169,10 +169,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -203,10 +203,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -237,10 +237,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -271,10 +271,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -317,10 +317,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -363,10 +363,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -405,10 +405,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
@@ -443,10 +443,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -489,10 +489,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -531,10 +531,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 7045a08f46ee..5d485c4c1fdb 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -45,10 +45,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index ea7177c0f19c..f7080c30a945 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -61,10 +61,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -87,11 +87,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -115,11 +115,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -151,11 +151,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
index a161c48db749..a43a8f5b0b9a 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -102,10 +102,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -128,10 +128,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -154,10 +154,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -180,10 +180,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
@@ -206,10 +206,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order Status")
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -232,10 +232,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 8b45bc5a9400..0dd537b1e8d5 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -53,10 +53,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
@@ -79,10 +79,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MY_STRING)
@@ -105,10 +105,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index 7599a638c8d9..3f395fa857e6 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -45,10 +45,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_VALUE)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 1bd0c8646156..a38bc9ace9d0 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -97,10 +97,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -123,10 +123,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java
index 87d9668dfbf8..cbfdbc8345d0 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,10 +109,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -135,10 +135,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CATEGORY)
@@ -161,10 +161,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -195,10 +195,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
@@ -230,10 +230,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TAGS)
@@ -256,10 +256,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "pet status in the store")
   @JsonProperty(JSON_PROPERTY_STATUS)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b46a817233ef..bf7a87166fa5 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -42,8 +42,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -52,10 +52,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -73,10 +73,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAZ)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f1790c834764..931a9e179662 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -45,10 +45,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java
index d2f0539f749d..5815a67e615a 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java
@@ -48,10 +48,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -74,10 +74,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index d6dd4a72aa9b..7c7330bdaae9 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -48,10 +48,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/User.java
index b4ecfdafcfe3..a2ba69d404e1 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/User.java
@@ -72,10 +72,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -98,10 +98,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -124,10 +124,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -150,10 +150,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -176,10 +176,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -202,10 +202,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -228,10 +228,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -254,10 +254,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "User Status")
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/client/petstore/java/restclient/api/openapi.yaml b/samples/client/petstore/java/restclient/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/restclient/api/openapi.yaml
+++ b/samples/client/petstore/java/restclient/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 5b718c5ec548..8d9ea8b1b0d7 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index cc37c9dc944b..f51dbeed4e0c 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -48,10 +48,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java
index de09fd3da2a0..e40d279162fd 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Animal.java
@@ -60,10 +60,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -85,10 +85,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 60f5c5ed7df4..c817e412cfb0 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 604cdfcf717b..86a4a5fe2b79 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayTest.java
index 43ba7fd68e5c..7a428c7e657e 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Capitalization.java
index 0954957b128a..5a8de7bfd2a3 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,10 +88,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Cat.java
index 62f28fcc3b0c..b7c545ceba6f 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Cat.java
@@ -54,10 +54,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Category.java
index 5c8a22840470..acb312fda305 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 0bf486675508..fa4b636be560 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -55,10 +55,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ClassModel.java
index daeb72031209..fe3a8f793621 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Client.java
index 08272925589a..173665a09858 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index fd56383f5e92..30e9b06a7ab1 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -45,10 +45,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Dog.java
index 84aafd72053b..8b1a3a2a9881 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumArrays.java
index cb7313fa5c48..e20286cf8037 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java
index 0da1003337c4..7b148a8d48a9 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -224,10 +224,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -249,10 +249,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -274,10 +274,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -299,10 +299,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -324,10 +324,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -357,10 +357,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -382,10 +382,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -407,10 +407,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index a5d2645ac57d..e58d5d14e20d 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -51,10 +51,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index c8386e4b862f..57a2dfbb92d6 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Foo.java
index 0872af847353..608a54229901 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Foo.java
@@ -43,10 +43,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 90df79653214..cb2ea0695859 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -45,10 +45,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java
index 6dee29e00f4c..4261f74bac20 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -109,12 +109,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -136,12 +136,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,12 +188,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -215,12 +215,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -242,12 +242,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -269,10 +269,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -294,10 +294,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -319,10 +319,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -344,10 +344,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -369,10 +369,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -394,10 +394,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -419,10 +419,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -444,10 +444,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -469,10 +469,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -494,10 +494,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index e06f79f4f24d..3a5a8bdf084e 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index daca648321fd..f8606cebc05d 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -47,10 +47,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MapTest.java
index eb39702eab46..9f4a782d0e1a 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MapTest.java
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2cde00590d8f..7669f8c5d37b 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -114,10 +114,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Model200Response.java
index 1060a1be1c69..3cf913f9b054 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ef124b02157b..2f085200ae14 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelFile.java
index 32f359eb1061..787767e06e64 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -44,10 +44,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelList.java
index bf4d8691d8e3..442c9b12532d 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelReturn.java
index f02d51efb230..e9674f575b71 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Name.java
index 22983a12c82a..0f1d2b42915a 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NullableClass.java
index be55820e1171..8601ee0ea07a 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -100,10 +100,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -133,10 +133,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -166,10 +166,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -199,10 +199,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -232,10 +232,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -265,10 +265,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -310,10 +310,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -355,10 +355,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -396,10 +396,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -433,10 +433,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -478,10 +478,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -519,10 +519,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NumberOnly.java
index 8873121fd79e..b9d9fcb03f91 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 7203dbe56289..29087255dbed 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -60,10 +60,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,11 +85,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -112,11 +112,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -147,11 +147,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java
index ab12669f2bcb..36d5522f86e4 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -151,10 +151,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterComposite.java
index 98a1b40bccef..92bfe10f0a25 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index e312dc411150..97ae01106795 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -44,10 +44,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index ed98b677eb32..bec93c7259f5 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -96,10 +96,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Pet.java
index 6b1d6b6352af..a4b808eab6f7 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -225,10 +225,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4ff7f3db6440..7c0f95400978 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
index d4dbf6dc2e22..dcbfb88f8a2c 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Tag.java
index 2c2851098a93..82c4b33b7534 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index b729913783c5..ac7b656caef8 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -47,10 +47,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/User.java
index 5b914ce2ac90..161ea2a8daaf 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -146,10 +146,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -171,10 +171,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/resteasy/api/openapi.yaml
+++ b/samples/client/petstore/java/resteasy/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 55ac934f528b..a09d11d7474a 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 3a557c2aca7d..52f5f3da6424 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -48,10 +48,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
index 9c7596b2cfb0..fb8060948c5f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
@@ -60,10 +60,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -85,10 +85,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 9e972837b116..8feb9e018903 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 761e0f6c9d17..23629d1da5ae 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
index 46a6df1e4e34..e09e6bd4797a 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
index 3a82316cd11f..c5d6b86b6c69 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,10 +88,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
index 797d453b5457..36e096184ddf 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
@@ -54,10 +54,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
index e9daed894ab8..7c9d93682b1e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 07632d8f36dd..54c8da1f850f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -55,10 +55,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
index faeaf6d170f7..f855164463ba 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
index 4addbe634b17..50cca186dccf 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index e4f4e82aa533..9c42cffb7601 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -45,10 +45,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
index 78b64eaa57db..21bdbf6ac3ac 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
index 0d4340977e8c..01f7885a0fff 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
index 0e4e6a0540ad..1c109d2dd9d2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -224,10 +224,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -249,10 +249,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -274,10 +274,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -299,10 +299,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -324,10 +324,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -357,10 +357,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -382,10 +382,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -407,10 +407,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index db226a749a16..107e913f66d2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -51,10 +51,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c75f077d859..b3e7387cf6dc 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Foo.java
index 19172be87d0c..15d16a3010e7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Foo.java
@@ -43,10 +43,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 24fe1cafa473..a36cf7426541 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -45,10 +45,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
index 350ecc2b3d38..fa8df5cbe365 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -109,12 +109,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -136,12 +136,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,12 +188,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -215,12 +215,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -242,12 +242,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -269,10 +269,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -294,10 +294,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -319,10 +319,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -344,10 +344,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -369,10 +369,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -394,10 +394,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -419,10 +419,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -444,10 +444,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -469,10 +469,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -494,10 +494,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4e3d9aa3c7ec..2f46a0e85d02 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index d556badbc86b..e7e4e4ca5c6d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -47,10 +47,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
index 6a80971630f8..b0bb9fcb82de 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2cd1a36939b8..b9ab922abe22 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -114,10 +114,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
index 999b5e34446b..2a18245f5f79 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 19b3b2e5b411..1f13412355b8 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java
index 065dbc19bb0b..822fea6c2327 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -44,10 +44,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java
index 432cbfd18ee1..a8fb60cdfc2c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
index 491491e42994..669b30691c79 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
index 1168630509be..3b165e7570c7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NullableClass.java
index 354ea5db5101..3dedffa20417 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -100,10 +100,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -133,10 +133,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -166,10 +166,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -199,10 +199,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -232,10 +232,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -265,10 +265,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -310,10 +310,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -355,10 +355,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -396,10 +396,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -433,10 +433,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -478,10 +478,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -519,10 +519,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9b8575bb5aa3..8625f00c8741 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 8259facc6e12..d2ec47f7f4a9 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -60,10 +60,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,11 +85,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -112,11 +112,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -147,11 +147,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
index 198c4705b48d..0fc8d456873f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -151,10 +151,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5bbc97e9f32c..4adb1bc59812 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index d94b304fbc88..ea419cb7df38 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -44,10 +44,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 427b0421acd8..642875630cf2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -96,10 +96,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
index ef0a788e0e09..97d3f950180f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -225,10 +225,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4a4070939629..fa8bdd64bc96 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
index ddf6739e77ef..7d8ea856dd38 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
index a6b72d921a6a..518116d43ce5 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index dd167049f5bd..6b7f560ebb28 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -47,10 +47,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
index 2c0f53742f0a..2ecb4b0fbb3e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -146,10 +146,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -171,10 +171,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java
index 7ffc962caa44..f1a33b0822a8 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Category.java
@@ -42,8 +42,8 @@ public Category() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Category(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
     this.id = id;
     this.name = name;
@@ -55,10 +55,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -80,10 +80,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ab7dec59caa2..983779dbdcd4 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -47,8 +47,8 @@ public ModelApiResponse() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelApiResponse(@JsonProperty(JSON_PROPERTY_CODE) Integer code, @JsonProperty(JSON_PROPERTY_TYPE) String type, @JsonProperty(JSON_PROPERTY_MESSAGE) String message) {
     this.code = code;
     this.type = type;
@@ -61,10 +61,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -86,10 +86,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -111,10 +111,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java
index a336835eaafc..6c9b5aa4e3eb 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Order.java
@@ -96,8 +96,8 @@ public Order() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) {
     this.id = id;
     this.petId = petId;
@@ -113,10 +113,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -213,10 +213,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -238,10 +238,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java
index 54c680e733d8..ad30a0e12883 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Pet.java
@@ -100,8 +100,8 @@ public Pet() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Pet(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_CATEGORY) Category category, @JsonProperty(JSON_PROPERTY_NAME) String name, @JsonProperty(JSON_PROPERTY_PHOTO_URLS) List<String> photoUrls, @JsonProperty(JSON_PROPERTY_TAGS) List<Tag> tags, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status) {
     this.id = id;
     this.category = category;
@@ -117,10 +117,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -142,10 +142,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -167,10 +167,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -200,10 +200,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -233,10 +233,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -258,11 +258,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java
index 4515da929096..2745cc2a37ea 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/Tag.java
@@ -42,8 +42,8 @@ public Tag() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Tag(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
     this.id = id;
     this.name = name;
@@ -55,10 +55,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -80,10 +80,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java
index a58a63da8115..662320e0dff1 100644
--- a/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/model/User.java
@@ -66,8 +66,8 @@ public User() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public User(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_USERNAME) String username, @JsonProperty(JSON_PROPERTY_FIRST_NAME) String firstName, @JsonProperty(JSON_PROPERTY_LAST_NAME) String lastName, @JsonProperty(JSON_PROPERTY_EMAIL) String email, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PHONE) String phone, @JsonProperty(JSON_PROPERTY_USER_STATUS) Integer userStatus) {
     this.id = id;
     this.username = username;
@@ -85,10 +85,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -160,10 +160,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -185,10 +185,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -210,10 +210,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -235,10 +235,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -260,10 +260,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java
index 1132a85e2915..3df8846ed10c 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Category.java
@@ -50,10 +50,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -76,10 +76,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index f802574483e5..93a225ccceff 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -55,10 +55,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -81,10 +81,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -107,10 +107,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java
index 2de82492e14e..72b64106196c 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Order.java
@@ -104,10 +104,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -130,10 +130,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -156,10 +156,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -182,10 +182,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
@@ -208,10 +208,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -234,10 +234,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java
index 642fba659074..4a0fda1e8126 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -134,10 +134,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_CATEGORY)
@@ -160,10 +160,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -194,10 +194,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @ApiModelProperty(required = true, value = "")
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
@@ -228,10 +228,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_TAGS)
@@ -254,11 +254,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java
index 887136ef6cf3..11c0891574dd 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,10 +50,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -76,10 +76,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java
index 858ec512529b..4c42d91f93fc 100644
--- a/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/model/User.java
@@ -74,10 +74,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -100,10 +100,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -126,10 +126,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -152,10 +152,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -178,10 +178,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -204,10 +204,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -230,10 +230,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -256,10 +256,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Category.java
index ce971cb8f1b4..c6eff3c1a3ab 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Category.java
@@ -49,10 +49,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -75,10 +75,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 78237ea5976d..5419376c2576 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -54,10 +54,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -80,10 +80,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -106,10 +106,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Order.java
index e1f64666165b..ac069848c8b4 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -103,10 +103,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -129,10 +129,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -155,10 +155,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -181,10 +181,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
@@ -207,10 +207,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order Status")
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -233,10 +233,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Pet.java
index b51c42c1f895..739b196b2798 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Pet.java
@@ -107,10 +107,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CATEGORY)
@@ -159,10 +159,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -193,10 +193,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
@@ -227,10 +227,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TAGS)
@@ -253,11 +253,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "pet status in the store")
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Tag.java
index 9fe1449e822e..34bde5b6d878 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/Tag.java
@@ -49,10 +49,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -75,10 +75,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/User.java
index 6f80453b4f2d..c277bb473854 100644
--- a/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-swagger2/src/main/java/org/openapitools/client/model/User.java
@@ -73,10 +73,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -99,10 +99,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -125,10 +125,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -151,10 +151,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -177,10 +177,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -203,10 +203,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -229,10 +229,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -255,10 +255,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "User Status")
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index ab05a5819f19..1c36460659b8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -42,17 +42,11 @@
 @JacksonXmlRootElement(localName = "AdditionalPropertiesClass")
 public class AdditionalPropertiesClass {
   public static final String JSON_PROPERTY_MAP_PROPERTY = "map_property";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=String
-  @XmlElement(name = "inner")
+  @XmlElement(name = "map_property")
   private Map<String, String> mapProperty = new HashMap<>();
 
   public static final String JSON_PROPERTY_MAP_OF_MAP_PROPERTY = "map_of_map_property";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Map&lt;String, String&gt;
-  @XmlElement(name = "inner")
+  @XmlElement(name = "map_of_map_property")
   private Map<String, Map<String, String>> mapOfMapProperty = new HashMap<>();
 
   public AdditionalPropertiesClass() {
@@ -72,10 +66,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -109,10 +103,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 8fef8b9dfdf6..3822ea497784 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -57,10 +57,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
index a944cf5487a1..b4769c07e06d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
@@ -69,10 +69,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -96,10 +96,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 52634549fb8a..a19856f86ea5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -43,10 +43,7 @@
 @JacksonXmlRootElement(localName = "ArrayOfArrayOfNumberOnly")
 public class ArrayOfArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_ARRAY_NUMBER = "ArrayArrayNumber";
-  // Is a container wrapped=false
-  // items.name=arrayArrayNumber items.baseName=arrayArrayNumber items.xmlName= items.xmlNamespace=
-  // items.example= items.type=List&lt;BigDecimal&gt;
-  @XmlElement(name = "arrayArrayNumber")
+  @XmlElement(name = "ArrayArrayNumber")
   private List<List<BigDecimal>> arrayArrayNumber = new ArrayList<>();
 
   public ArrayOfArrayOfNumberOnly() {
@@ -66,10 +63,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f89f690741e8..f054dbd8ee47 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -43,10 +43,7 @@
 @JacksonXmlRootElement(localName = "ArrayOfNumberOnly")
 public class ArrayOfNumberOnly {
   public static final String JSON_PROPERTY_ARRAY_NUMBER = "ArrayNumber";
-  // Is a container wrapped=false
-  // items.name=arrayNumber items.baseName=arrayNumber items.xmlName= items.xmlNamespace=
-  // items.example= items.type=BigDecimal
-  @XmlElement(name = "arrayNumber")
+  @XmlElement(name = "ArrayNumber")
   private List<BigDecimal> arrayNumber = new ArrayList<>();
 
   public ArrayOfNumberOnly() {
@@ -66,10 +63,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
index 6abb8f9155c4..a594b2ceb9f7 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -45,24 +45,15 @@
 @JacksonXmlRootElement(localName = "ArrayTest")
 public class ArrayTest {
   public static final String JSON_PROPERTY_ARRAY_OF_STRING = "array_of_string";
-  // Is a container wrapped=false
-  // items.name=arrayOfString items.baseName=arrayOfString items.xmlName= items.xmlNamespace=
-  // items.example= items.type=String
-  @XmlElement(name = "arrayOfString")
+  @XmlElement(name = "array_of_string")
   private List<String> arrayOfString = new ArrayList<>();
 
   public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER = "array_array_of_integer";
-  // Is a container wrapped=false
-  // items.name=arrayArrayOfInteger items.baseName=arrayArrayOfInteger items.xmlName= items.xmlNamespace=
-  // items.example= items.type=List&lt;Long&gt;
-  @XmlElement(name = "arrayArrayOfInteger")
+  @XmlElement(name = "array_array_of_integer")
   private List<List<Long>> arrayArrayOfInteger = new ArrayList<>();
 
   public static final String JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL = "array_array_of_model";
-  // Is a container wrapped=false
-  // items.name=arrayArrayOfModel items.baseName=arrayArrayOfModel items.xmlName= items.xmlNamespace=
-  // items.example= items.type=List&lt;ReadOnlyFirst&gt;
-  @XmlElement(name = "arrayArrayOfModel")
+  @XmlElement(name = "array_array_of_model")
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
 
   public ArrayTest() {
@@ -82,10 +73,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -119,10 +110,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -156,10 +147,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
index 4647bd98b778..5d2fcc12865c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -76,10 +76,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -103,10 +103,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -157,10 +157,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -184,10 +184,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -211,10 +211,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
index 9e368b552925..f1e4be9d5ff7 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
@@ -62,10 +62,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
index b4424b875e64..18e886e0749e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
@@ -56,10 +56,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -83,10 +83,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 2d200b3d3257..40471900fb67 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -63,10 +63,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
index 9d6b09e04b01..f6dd98ce866b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -51,10 +51,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
index e2781953f603..6430dc23a9f1 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
@@ -51,10 +51,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index a64cfff26f1d..0bc8d5f52e24 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -53,10 +53,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
index 1e95fa8a4b0e..aaef69a1f1b0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
@@ -62,10 +62,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
index 956eb4ba8525..81113c78052c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -125,10 +125,7 @@ public static ArrayEnumEnum fromValue(String value) {
   }
 
   public static final String JSON_PROPERTY_ARRAY_ENUM = "array_enum";
-  // Is a container wrapped=false
-  // items.name=arrayEnum items.baseName=arrayEnum items.xmlName= items.xmlNamespace=
-  // items.example= items.type=String
-  @XmlElement(name = "arrayEnum")
+  @XmlElement(name = "array_enum")
   private List<ArrayEnumEnum> arrayEnum = new ArrayList<>();
 
   public EnumArrays() {
@@ -140,10 +137,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -175,10 +172,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
index c667d2728695..1e52f26f31c9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -257,10 +257,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -284,10 +284,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -311,10 +311,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -338,10 +338,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -365,10 +365,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -399,10 +399,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -426,10 +426,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -453,10 +453,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index c14d3a33fb4c..18b1b7518236 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -48,10 +48,7 @@ public class FakeBigDecimalMap200Response {
   private BigDecimal someId;
 
   public static final String JSON_PROPERTY_SOME_MAP = "someMap";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=BigDecimal
-  @XmlElement(name = "inner")
+  @XmlElement(name = "someMap")
   private Map<String, BigDecimal> someMap = new HashMap<>();
 
   public FakeBigDecimalMap200Response() {
@@ -63,10 +60,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +95,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3582eec63d72..1d6aee0c3e2a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,9 +48,6 @@ public class FileSchemaTestClass {
   private ModelFile _file;
 
   public static final String JSON_PROPERTY_FILES = "files";
-  // Is a container wrapped=false
-  // items.name=files items.baseName=files items.xmlName= items.xmlNamespace=
-  // items.example= items.type=ModelFile
   @XmlElement(name = "files")
   private List<ModelFile> files = new ArrayList<>();
 
@@ -63,10 +60,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +95,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Foo.java
index d5e6eaaef2ad..944919d2b7be 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Foo.java
@@ -51,10 +51,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index d67a399616e1..e70672cef645 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -53,10 +53,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
index f973704a8fef..3f96e9efb108 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -133,12 +133,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -162,12 +162,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -191,10 +191,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -218,12 +218,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -247,12 +247,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -276,12 +276,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -305,10 +305,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -332,10 +332,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -359,10 +359,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -386,10 +386,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -413,10 +413,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -440,10 +440,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -467,10 +467,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -494,10 +494,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -521,10 +521,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -548,10 +548,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index eac5d26b6472..ef269f991936 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -51,10 +51,10 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -66,10 +66,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 08ce77761e8f..c50b41a457ee 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -55,10 +55,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
index 02eaaeb81e2c..9e5e2b44c3bf 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
@@ -44,10 +44,7 @@
 @JacksonXmlRootElement(localName = "MapTest")
 public class MapTest {
   public static final String JSON_PROPERTY_MAP_MAP_OF_STRING = "map_map_of_string";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Map&lt;String, String&gt;
-  @XmlElement(name = "inner")
+  @XmlElement(name = "map_map_of_string")
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
   /**
@@ -90,24 +87,15 @@ public static InnerEnum fromValue(String value) {
   }
 
   public static final String JSON_PROPERTY_MAP_OF_ENUM_STRING = "map_of_enum_string";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=String
-  @XmlElement(name = "inner")
+  @XmlElement(name = "map_of_enum_string")
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
   public static final String JSON_PROPERTY_DIRECT_MAP = "direct_map";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Boolean
-  @XmlElement(name = "inner")
+  @XmlElement(name = "direct_map")
   private Map<String, Boolean> directMap = new HashMap<>();
 
   public static final String JSON_PROPERTY_INDIRECT_MAP = "indirect_map";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Boolean
-  @XmlElement(name = "inner")
+  @XmlElement(name = "indirect_map")
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
   public MapTest() {
@@ -127,10 +115,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -164,10 +152,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +189,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -238,10 +226,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index fd75e8c22ca1..1ea56d1d8f0c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -55,10 +55,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
   private OffsetDateTime dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Animal
-  @XmlElement(name = "inner")
+  @XmlElement(name = "map")
   private Map<String, Animal> map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
@@ -70,10 +67,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,10 +94,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -132,10 +129,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
index ca31e562b79d..63e195ff5d58 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -57,10 +57,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 79559442c648..a103523ab7c2 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -62,10 +62,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -89,10 +89,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java
index 47d278b90587..e040a52ff81f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -52,10 +52,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java
index 97f8aa1179d8..77ab5d3167ac 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelList.java
@@ -52,10 +52,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
index a023d8f35f49..7a39006b2a80 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -52,10 +52,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
index cb35591fbb09..68d56a54e887 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
@@ -66,10 +66,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -87,10 +87,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -108,10 +108,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NullableClass.java
index f741f2545c3d..7d57219e7e7a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -87,45 +87,27 @@ public class NullableClass extends HashMap<String, Object> {
   private JsonNullable<OffsetDateTime> datetimeProp = JsonNullable.<OffsetDateTime>undefined();
 
   public static final String JSON_PROPERTY_ARRAY_NULLABLE_PROP = "array_nullable_prop";
-  // Is a container wrapped=false
-  // items.name=arrayNullableProp items.baseName=arrayNullableProp items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Object
-  @XmlElement(name = "arrayNullableProp")
+  @XmlElement(name = "array_nullable_prop")
   private JsonNullable<List<Object>> arrayNullableProp = JsonNullable.<List<Object>>undefined();
 
   public static final String JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP = "array_and_items_nullable_prop";
-  // Is a container wrapped=false
-  // items.name=arrayAndItemsNullableProp items.baseName=arrayAndItemsNullableProp items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Object
-  @XmlElement(name = "arrayAndItemsNullableProp")
+  @XmlElement(name = "array_and_items_nullable_prop")
   private JsonNullable<List<Object>> arrayAndItemsNullableProp = JsonNullable.<List<Object>>undefined();
 
   public static final String JSON_PROPERTY_ARRAY_ITEMS_NULLABLE = "array_items_nullable";
-  // Is a container wrapped=false
-  // items.name=arrayItemsNullable items.baseName=arrayItemsNullable items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Object
-  @XmlElement(name = "arrayItemsNullable")
+  @XmlElement(name = "array_items_nullable")
   private List<Object> arrayItemsNullable = new ArrayList<>();
 
   public static final String JSON_PROPERTY_OBJECT_NULLABLE_PROP = "object_nullable_prop";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Object
-  @XmlElement(name = "inner")
+  @XmlElement(name = "object_nullable_prop")
   private JsonNullable<Map<String, Object>> objectNullableProp = JsonNullable.<Map<String, Object>>undefined();
 
   public static final String JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP = "object_and_items_nullable_prop";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Object
-  @XmlElement(name = "inner")
+  @XmlElement(name = "object_and_items_nullable_prop")
   private JsonNullable<Map<String, Object>> objectAndItemsNullableProp = JsonNullable.<Map<String, Object>>undefined();
 
   public static final String JSON_PROPERTY_OBJECT_ITEMS_NULLABLE = "object_items_nullable";
-  // Is a container wrapped=false
-  // items.name=inner items.baseName=inner items.xmlName= items.xmlNamespace=
-  // items.example= items.type=Object
-  @XmlElement(name = "inner")
+  @XmlElement(name = "object_items_nullable")
   private Map<String, Object> objectItemsNullable = new HashMap<>();
 
   public NullableClass() {
@@ -138,10 +120,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -172,10 +154,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -206,10 +188,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -240,10 +222,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -274,10 +256,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -308,10 +290,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -354,10 +336,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -401,10 +383,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -444,10 +426,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -485,10 +467,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -532,10 +514,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -575,10 +557,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
index 6e38b992db6f..9d472bd315d8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -52,10 +52,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 4a50a0ac002e..3dfde08a6bd8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -59,9 +59,6 @@ public class ObjectWithDeprecatedFields {
   private DeprecatedObject deprecatedRef;
 
   public static final String JSON_PROPERTY_BARS = "bars";
-  // Is a container wrapped=false
-  // items.name=bars items.baseName=bars items.xmlName= items.xmlNamespace=
-  // items.example= items.type=String
   @XmlElement(name = "bars")
   private List<String> bars = new ArrayList<>();
 
@@ -74,10 +71,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -101,11 +98,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -130,11 +127,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -167,11 +164,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
index c1edb309d786..5227ae95296b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
@@ -120,10 +120,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -147,10 +147,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -174,10 +174,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -228,10 +228,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -255,10 +255,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
index f5fd330c7d9c..c5e0924e87fb 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -62,10 +62,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -89,10 +89,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index 770309d145e9..93fcfe6197f0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -52,10 +52,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index d945d64d634f..f47a7983debb 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -108,10 +108,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
index 003d577a1134..c83a3282a2c2 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
@@ -64,17 +64,11 @@ public class Pet {
   private String name;
 
   public static final String JSON_PROPERTY_PHOTO_URLS = "photoUrls";
-  // Is a container wrapped=true
-  // items.name=photoUrls items.baseName=photoUrls items.xmlName= items.xmlNamespace=
-  // items.example= items.type=String
-  @XmlElement(name = "photoUrls")
-  @XmlElementWrapper(name = "photoUrl")
+  @XmlElement(name = "photoUrl")
+  @XmlElementWrapper(name = "photoUrls")
   private Set<String> photoUrls = new LinkedHashSet<>();
 
   public static final String JSON_PROPERTY_TAGS = "tags";
-  // Is a container wrapped=true
-  // items.name=tags items.baseName=tags items.xmlName=Tag items.xmlNamespace=
-  // items.example= items.type=Tag
   @XmlElement(name = "Tag")
   @XmlElementWrapper(name = "tag")
   private List<Tag> tags = new ArrayList<>();
@@ -134,10 +128,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -161,10 +155,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +182,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -223,16 +217,15 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  // xmlName=photoUrl
   @JacksonXmlProperty(localName = "photoUrl")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrl")
+  @JacksonXmlElementWrapper(localName = "photoUrls", useWrapping = true)
 
   public Set<String> getPhotoUrls() {
     return photoUrls;
@@ -242,9 +235,8 @@ public Set<String> getPhotoUrls() {
   @JsonDeserialize(as = LinkedHashSet.class)
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  // xmlName=photoUrl
   @JacksonXmlProperty(localName = "photoUrl")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "photoUrl")
+  @JacksonXmlElementWrapper(localName = "photoUrls", useWrapping = true)
   public void setPhotoUrls(Set<String> photoUrls) {
     this.photoUrls = photoUrls;
   }
@@ -263,16 +255,15 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  // xmlName=tag
-  @JacksonXmlProperty(localName = "tag")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "tag")
+  @JacksonXmlProperty(localName = "Tag")
+  @JacksonXmlElementWrapper(localName = "tag", useWrapping = true)
 
   public List<Tag> getTags() {
     return tags;
@@ -281,9 +272,8 @@ public List<Tag> getTags() {
 
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  // xmlName=tag
-  @JacksonXmlProperty(localName = "tag")
-  @JacksonXmlElementWrapper(useWrapping = true, localName = "tag")
+  @JacksonXmlProperty(localName = "Tag")
+  @JacksonXmlElementWrapper(localName = "tag", useWrapping = true)
   public void setTags(List<Tag> tags) {
     this.tags = tags;
   }
@@ -294,10 +284,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index d94be5ba1d04..69536c0d5d6c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -50,10 +50,10 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
index eefaff52ae4e..768e982ba3e2 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -52,10 +52,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
index cac17a292689..5f4163d5846f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
@@ -56,10 +56,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -83,10 +83,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index c7f187637e8f..17f6b4beceb3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -55,10 +55,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
index 3d2302e4f7d6..a32c0d4945f6 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
@@ -86,10 +86,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -140,10 +140,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -167,10 +167,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -194,10 +194,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -248,10 +248,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -275,10 +275,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/resttemplate/api/openapi.yaml
+++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
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 52085c1cc4c9..dafc0d90d084 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
@@ -44,8 +44,8 @@ public AdditionalPropertiesClass() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_MAP_PROPERTY) Map<String, String> mapProperty, @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY) Map<String, Map<String, String>> mapOfMapProperty) {
     this.mapProperty = mapProperty;
     this.mapOfMapProperty = mapOfMapProperty;
@@ -65,10 +65,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +98,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 16c692738ac5..23ee75496a05 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -43,8 +43,8 @@ public AllOfWithSingleRef() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AllOfWithSingleRef(@JsonProperty(JSON_PROPERTY_USERNAME) String username, @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE) SingleRefType singleRefType) {
     this.username = username;
     this.singleRefType = singleRefType;
@@ -56,10 +56,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
index 71bd87b976d4..bfc4c3c55ef0 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
@@ -55,8 +55,8 @@ public Animal() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Animal(@JsonProperty(JSON_PROPERTY_CLASS_NAME) String className, @JsonProperty(JSON_PROPERTY_COLOR) String color) {
     this.className = className;
     this.color = color;
@@ -68,10 +68,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -93,10 +93,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 6bb84dd91c8c..4ad9f08a2732 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
@@ -42,8 +42,8 @@ public ArrayOfArrayOfNumberOnly() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ArrayOfArrayOfNumberOnly(@JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER) List<List<BigDecimal>> arrayArrayNumber) {
     this.arrayArrayNumber = arrayArrayNumber;
   }
@@ -62,10 +62,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 9c729c8acb4e..e953bcfdba39 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
@@ -42,8 +42,8 @@ public ArrayOfNumberOnly() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ArrayOfNumberOnly(@JsonProperty(JSON_PROPERTY_ARRAY_NUMBER) List<BigDecimal> arrayNumber) {
     this.arrayNumber = arrayNumber;
   }
@@ -62,10 +62,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 e15922cba624..a765509d8cb5 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
@@ -50,8 +50,8 @@ public ArrayTest() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ArrayTest(@JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING) List<String> arrayOfString, @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER) List<List<Long>> arrayArrayOfInteger, @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL) List<List<ReadOnlyFirst>> arrayArrayOfModel) {
     this.arrayOfString = arrayOfString;
     this.arrayArrayOfInteger = arrayArrayOfInteger;
@@ -72,10 +72,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -105,10 +105,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
index f45da7f6e8ad..d6ff62b0c87e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -58,8 +58,8 @@ public Capitalization() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Capitalization(@JsonProperty(JSON_PROPERTY_SMALL_CAMEL) String smallCamel, @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL) String capitalCamel, @JsonProperty(JSON_PROPERTY_SMALL_SNAKE) String smallSnake, @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE) String capitalSnake, @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS) String scAETHFlowPoints, @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E) String ATT_NAME) {
     this.smallCamel = smallCamel;
     this.capitalCamel = capitalCamel;
@@ -75,10 +75,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -100,10 +100,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -150,10 +150,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -175,10 +175,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -200,10 +200,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
index 3581d84539b8..5c4838b3715c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
@@ -49,8 +49,8 @@ public Cat() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Cat(@JsonProperty(JSON_PROPERTY_DECLAWED) Boolean declawed, @JsonProperty(JSON_PROPERTY_CLASS_NAME) String className, @JsonProperty(JSON_PROPERTY_COLOR) String color) {
     super(className, color);
     this.declawed = declawed;
@@ -62,10 +62,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
index 9d30b5bf69cb..1a7438f06712 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
@@ -42,8 +42,8 @@ public Category() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Category(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
     this.id = id;
     this.name = name;
@@ -55,10 +55,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -80,10 +80,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index f7b9a366ed2e..c110254fd32e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -50,8 +50,8 @@ public ChildWithNullable() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ChildWithNullable(@JsonProperty(JSON_PROPERTY_OTHER_PROPERTY) String otherProperty, @JsonProperty(JSON_PROPERTY_TYPE) TypeEnum type, @JsonProperty(JSON_PROPERTY_NULLABLE_PROPERTY) String nullableProperty) {
     super(type, nullableProperty);
     this.otherProperty = otherProperty;
@@ -63,10 +63,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
index 007756d53231..747af799390e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -38,8 +38,8 @@ public ClassModel() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ClassModel(@JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) String propertyClass) {
     this.propertyClass = propertyClass;
   }
@@ -50,10 +50,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
index 74b8e3a50d76..cac6829dffd3 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
@@ -38,8 +38,8 @@ public Client() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Client(@JsonProperty(JSON_PROPERTY_CLIENT) String client) {
     this.client = client;
   }
@@ -50,10 +50,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 7b3ee742c85e..b3dd9be1256d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -40,8 +40,8 @@ public DeprecatedObject() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public DeprecatedObject(@JsonProperty(JSON_PROPERTY_NAME) String name) {
     this.name = name;
   }
@@ -52,10 +52,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
index 979da0b68e6e..dead03415015 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
@@ -49,8 +49,8 @@ public Dog() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Dog(@JsonProperty(JSON_PROPERTY_BREED) String breed, @JsonProperty(JSON_PROPERTY_CLASS_NAME) String className, @JsonProperty(JSON_PROPERTY_COLOR) String color) {
     super(className, color);
     this.breed = breed;
@@ -62,10 +62,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 44dd02374f64..2f143aad8a40 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
@@ -115,8 +115,8 @@ public EnumArrays() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public EnumArrays(@JsonProperty(JSON_PROPERTY_JUST_SYMBOL) JustSymbolEnum justSymbol, @JsonProperty(JSON_PROPERTY_ARRAY_ENUM) List<ArrayEnumEnum> arrayEnum) {
     this.justSymbol = justSymbol;
     this.arrayEnum = arrayEnum;
@@ -128,10 +128,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -161,10 +161,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
index 2b4c9d558625..ba09d6c36eab 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -219,8 +219,8 @@ public EnumTest() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public EnumTest(@JsonProperty(JSON_PROPERTY_ENUM_STRING) EnumStringEnum enumString, @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED) EnumStringRequiredEnum enumStringRequired, @JsonProperty(JSON_PROPERTY_ENUM_INTEGER) EnumIntegerEnum enumInteger, @JsonProperty(JSON_PROPERTY_ENUM_NUMBER) EnumNumberEnum enumNumber, @JsonProperty(JSON_PROPERTY_OUTER_ENUM) OuterEnum outerEnum, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER) OuterEnumInteger outerEnumInteger, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE) OuterEnumDefaultValue outerEnumDefaultValue, @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE) OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue) {
     this.enumString = enumString;
     this.enumStringRequired = enumStringRequired;
@@ -238,10 +238,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -263,10 +263,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -288,10 +288,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -313,10 +313,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -338,10 +338,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -371,10 +371,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -396,10 +396,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -421,10 +421,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index e9ea261576f9..989e98dea433 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -46,8 +46,8 @@ public FakeBigDecimalMap200Response() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public FakeBigDecimalMap200Response(@JsonProperty(JSON_PROPERTY_SOME_ID) BigDecimal someId, @JsonProperty(JSON_PROPERTY_SOME_MAP) Map<String, BigDecimal> someMap) {
     this.someId = someId;
     this.someMap = someMap;
@@ -59,10 +59,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -92,10 +92,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 7c5720540d02..a83280ad5e7f 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
@@ -46,8 +46,8 @@ public FileSchemaTestClass() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public FileSchemaTestClass(@JsonProperty(JSON_PROPERTY_FILE) ModelFile _file, @JsonProperty(JSON_PROPERTY_FILES) List<ModelFile> files) {
     this._file = _file;
     this.files = files;
@@ -59,10 +59,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -92,10 +92,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java
index cdcde2311997..1a1c879f1986 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Foo.java
@@ -38,8 +38,8 @@ public Foo() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Foo(@JsonProperty(JSON_PROPERTY_BAR) String bar) {
     this.bar = bar;
   }
@@ -50,10 +50,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 7e2537d5512f..ef17ab773235 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -40,8 +40,8 @@ public FooGetDefaultResponse() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public FooGetDefaultResponse(@JsonProperty(JSON_PROPERTY_STRING) Foo string) {
     this.string = string;
   }
@@ -52,10 +52,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
index 11fd95fb1463..302057035c14 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -104,8 +104,8 @@ public FormatTest() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public FormatTest(@JsonProperty(JSON_PROPERTY_INTEGER) Integer integer, @JsonProperty(JSON_PROPERTY_INT32) Integer int32, @JsonProperty(JSON_PROPERTY_INT64) Long int64, @JsonProperty(JSON_PROPERTY_NUMBER) BigDecimal number, @JsonProperty(JSON_PROPERTY_FLOAT) Float _float, @JsonProperty(JSON_PROPERTY_DOUBLE) Double _double, @JsonProperty(JSON_PROPERTY_DECIMAL) BigDecimal decimal, @JsonProperty(JSON_PROPERTY_STRING) String string, @JsonProperty(JSON_PROPERTY_BYTE) byte[] _byte, @JsonProperty(JSON_PROPERTY_BINARY) File binary, @JsonProperty(JSON_PROPERTY_DATE) LocalDate date, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS) String patternWithDigits, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER) String patternWithDigitsAndDelimiter) {
     this.integer = integer;
     this.int32 = int32;
@@ -131,12 +131,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,12 +158,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -185,10 +185,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -210,12 +210,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -237,12 +237,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -264,12 +264,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -291,10 +291,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -316,10 +316,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -341,10 +341,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -366,10 +366,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -391,10 +391,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -416,10 +416,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -441,10 +441,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -466,10 +466,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -491,10 +491,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -516,10 +516,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 6f672c5635f8..d67cb0ef641d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters and all parameters
-  */
+   * Constructor with only readonly parameters and all parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 7cc505a11d92..3711ad7618f7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -42,8 +42,8 @@ public HealthCheckResult() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public HealthCheckResult(@JsonProperty(JSON_PROPERTY_NULLABLE_MESSAGE) String nullableMessage) {
     this.nullableMessage = nullableMessage == null ? JsonNullable.<String>undefined() : JsonNullable.of(nullableMessage);
   }
@@ -54,10 +54,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
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 5be8fda11d7d..ea15323bc614 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
@@ -87,8 +87,8 @@ public MapTest() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public MapTest(@JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING) Map<String, Map<String, String>> mapMapOfString, @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING) Map<String, InnerEnum> mapOfEnumString, @JsonProperty(JSON_PROPERTY_DIRECT_MAP) Map<String, Boolean> directMap, @JsonProperty(JSON_PROPERTY_INDIRECT_MAP) Map<String, Boolean> indirectMap) {
     this.mapMapOfString = mapMapOfString;
     this.mapOfEnumString = mapOfEnumString;
@@ -110,10 +110,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -143,10 +143,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -209,10 +209,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 fd779b84412a..c99ffff6f539 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
@@ -51,8 +51,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public MixedPropertiesAndAdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_MAP) Map<String, Animal> map) {
     this.uuid = uuid;
     this.dateTime = dateTime;
@@ -65,10 +65,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -123,10 +123,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
index 6bc71d0ee67d..bae256e28da9 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -43,8 +43,8 @@ public Model200Response() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Model200Response(@JsonProperty(JSON_PROPERTY_NAME) Integer name, @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS) String propertyClass) {
     this.name = name;
     this.propertyClass = propertyClass;
@@ -56,10 +56,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index f766beeca88d..ac7d4fa670fe 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -47,8 +47,8 @@ public ModelApiResponse() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelApiResponse(@JsonProperty(JSON_PROPERTY_CODE) Integer code, @JsonProperty(JSON_PROPERTY_TYPE) String type, @JsonProperty(JSON_PROPERTY_MESSAGE) String message) {
     this.code = code;
     this.type = type;
@@ -61,10 +61,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -86,10 +86,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -111,10 +111,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java
index 117282ff108a..68de3ddbe697 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -39,8 +39,8 @@ public ModelFile() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelFile(@JsonProperty(JSON_PROPERTY_SOURCE_U_R_I) String sourceURI) {
     this.sourceURI = sourceURI;
   }
@@ -51,10 +51,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java
index 6389d49b6aa9..c5a9848bd886 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelList.java
@@ -39,8 +39,8 @@ public ModelList() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelList(@JsonProperty(JSON_PROPERTY_123LIST) String _123list) {
     this._123list = _123list;
   }
@@ -51,10 +51,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
index 01f9da6033b1..b991e3bdd4e2 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,8 +39,8 @@ public ModelReturn() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelReturn(@JsonProperty(JSON_PROPERTY_RETURN) Integer _return) {
     this._return = _return;
   }
@@ -51,10 +51,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
index 7ae59941d826..162ab98a241d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -62,8 +62,8 @@ public Name(
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Name(@JsonProperty(JSON_PROPERTY_NAME) Integer name, @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, @JsonProperty(JSON_PROPERTY_PROPERTY) String property, @JsonProperty(JSON_PROPERTY_123NUMBER) Integer _123number) {
     this.name = name;
     this.snakeCase = snakeCase;
@@ -77,10 +77,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -96,10 +96,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java
index c90bb4fc06eb..5b82b6cb0312 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -95,8 +95,8 @@ public NullableClass() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public NullableClass(@JsonProperty(JSON_PROPERTY_INTEGER_PROP) Integer integerProp, @JsonProperty(JSON_PROPERTY_NUMBER_PROP) BigDecimal numberProp, @JsonProperty(JSON_PROPERTY_BOOLEAN_PROP) Boolean booleanProp, @JsonProperty(JSON_PROPERTY_STRING_PROP) String stringProp, @JsonProperty(JSON_PROPERTY_DATE_PROP) LocalDate dateProp, @JsonProperty(JSON_PROPERTY_DATETIME_PROP) OffsetDateTime datetimeProp, @JsonProperty(JSON_PROPERTY_ARRAY_NULLABLE_PROP) List<Object> arrayNullableProp, @JsonProperty(JSON_PROPERTY_ARRAY_AND_ITEMS_NULLABLE_PROP) List<Object> arrayAndItemsNullableProp, @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE) List<Object> arrayItemsNullable, @JsonProperty(JSON_PROPERTY_OBJECT_NULLABLE_PROP) Map<String, Object> objectNullableProp, @JsonProperty(JSON_PROPERTY_OBJECT_AND_ITEMS_NULLABLE_PROP) Map<String, Object> objectAndItemsNullableProp, @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE) Map<String, Object> objectItemsNullable) {
     super();
     this.integerProp = integerProp == null ? JsonNullable.<Integer>undefined() : JsonNullable.of(integerProp);
@@ -119,10 +119,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -152,10 +152,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -185,10 +185,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -218,10 +218,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -251,10 +251,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -284,10 +284,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -329,10 +329,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -374,10 +374,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -415,10 +415,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -452,10 +452,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -497,10 +497,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -538,10 +538,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
index 881ff1a5d15d..15761203bf7e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,8 +39,8 @@ public NumberOnly() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public NumberOnly(@JsonProperty(JSON_PROPERTY_JUST_NUMBER) BigDecimal justNumber) {
     this.justNumber = justNumber;
   }
@@ -51,10 +51,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 81fe89a441d8..6e156c7c404d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -55,8 +55,8 @@ public ObjectWithDeprecatedFields() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ObjectWithDeprecatedFields(@JsonProperty(JSON_PROPERTY_UUID) String uuid, @JsonProperty(JSON_PROPERTY_ID) BigDecimal id, @JsonProperty(JSON_PROPERTY_DEPRECATED_REF) DeprecatedObject deprecatedRef, @JsonProperty(JSON_PROPERTY_BARS) List<String> bars) {
     this.uuid = uuid;
     this.id = id;
@@ -70,10 +70,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -95,11 +95,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -122,11 +122,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -157,11 +157,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index a1b9e0e19ddf..3b4cf9f29a4a 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -96,8 +96,8 @@ public Order() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Order(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_PET_ID) Long petId, @JsonProperty(JSON_PROPERTY_QUANTITY) Integer quantity, @JsonProperty(JSON_PROPERTY_SHIP_DATE) OffsetDateTime shipDate, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status, @JsonProperty(JSON_PROPERTY_COMPLETE) Boolean complete) {
     this.id = id;
     this.petId = petId;
@@ -113,10 +113,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -213,10 +213,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -238,10 +238,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
index 7b2376c869f5..5836a361b9c0 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -47,8 +47,8 @@ public OuterComposite() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public OuterComposite(@JsonProperty(JSON_PROPERTY_MY_NUMBER) BigDecimal myNumber, @JsonProperty(JSON_PROPERTY_MY_STRING) String myString, @JsonProperty(JSON_PROPERTY_MY_BOOLEAN) Boolean myBoolean) {
     this.myNumber = myNumber;
     this.myString = myString;
@@ -61,10 +61,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -86,10 +86,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -111,10 +111,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index 4ee6da71cd7f..e22892e19e11 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -39,8 +39,8 @@ public OuterObjectWithEnumProperty() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public OuterObjectWithEnumProperty(@JsonProperty(JSON_PROPERTY_VALUE) OuterEnumInteger value) {
     this.value = value;
   }
@@ -51,10 +51,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index c09a92ea3be1..bc20507b264a 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -91,8 +91,8 @@ public ParentWithNullable() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ParentWithNullable(@JsonProperty(JSON_PROPERTY_TYPE) TypeEnum type, @JsonProperty(JSON_PROPERTY_NULLABLE_PROPERTY) String nullableProperty) {
     this.type = type;
     this.nullableProperty = nullableProperty == null ? JsonNullable.<String>undefined() : JsonNullable.of(nullableProperty);
@@ -104,10 +104,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
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 fb49d70d9c7d..cc20b89d3121 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
@@ -103,8 +103,8 @@ public Pet() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Pet(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_CATEGORY) Category category, @JsonProperty(JSON_PROPERTY_NAME) String name, @JsonProperty(JSON_PROPERTY_PHOTO_URLS) Set<String> photoUrls, @JsonProperty(JSON_PROPERTY_TAGS) List<Tag> tags, @JsonProperty(JSON_PROPERTY_STATUS) StatusEnum status) {
     this.id = id;
     this.category = category;
@@ -120,10 +120,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -145,10 +145,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -170,10 +170,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -203,10 +203,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -237,10 +237,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -262,10 +262,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index e9e90316743a..8dbb1421e581 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -52,17 +52,17 @@ public ReadOnlyFirst(
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ReadOnlyFirst(@JsonProperty(JSON_PROPERTY_BAR) String bar, @JsonProperty(JSON_PROPERTY_BAZ) String baz) {
     this.bar = bar;
     this.baz = baz;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f8640d89fa69..292e22193b23 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -39,8 +39,8 @@ public SpecialModelName() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public SpecialModelName(@JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) Long $specialPropertyName) {
     this.$specialPropertyName = $specialPropertyName;
   }
@@ -51,10 +51,10 @@ public SpecialModelName(@JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME) Lon
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
index aeed192673b3..8f9c9750cd65 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
@@ -42,8 +42,8 @@ public Tag() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Tag(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_NAME) String name) {
     this.id = id;
     this.name = name;
@@ -55,10 +55,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -80,10 +80,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index b7bfdbd6e576..b3057538cb48 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -42,8 +42,8 @@ public TestInlineFreeformAdditionalPropertiesRequest() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public TestInlineFreeformAdditionalPropertiesRequest(@JsonProperty(JSON_PROPERTY_SOME_PROPERTY) String someProperty) {
     super();
     this.someProperty = someProperty;
@@ -55,10 +55,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
index c9a39d4dac7f..a3418bb305d5 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
@@ -66,8 +66,8 @@ public User() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public User(@JsonProperty(JSON_PROPERTY_ID) Long id, @JsonProperty(JSON_PROPERTY_USERNAME) String username, @JsonProperty(JSON_PROPERTY_FIRST_NAME) String firstName, @JsonProperty(JSON_PROPERTY_LAST_NAME) String lastName, @JsonProperty(JSON_PROPERTY_EMAIL) String email, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PHONE) String phone, @JsonProperty(JSON_PROPERTY_USER_STATUS) Integer userStatus) {
     this.id = id;
     this.username = username;
@@ -85,10 +85,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -110,10 +110,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -160,10 +160,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -185,10 +185,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -210,10 +210,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -235,10 +235,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -260,10 +260,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index b4a504865f4d..3eb4e49d0dd7 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -48,10 +48,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 491c21791985..9b830127c3ec 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 58260e72ebf8..3cb4304e7500 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -48,10 +48,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 906667beda31..6acd93d49665 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -97,10 +97,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
@@ -131,10 +131,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -166,10 +166,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
@@ -200,10 +200,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
@@ -234,10 +234,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -269,10 +269,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -304,10 +304,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -339,10 +339,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -366,10 +366,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ANYTYPE1)
@@ -392,10 +392,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ANYTYPE2)
@@ -418,10 +418,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ANYTYPE3)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index e8c61167b1b4..e5cfb971522f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -48,10 +48,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ee6970da8dd3..be3e06561bbc 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -49,10 +49,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index e07f8aeb4577..ae75d5d2bf26 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -48,10 +48,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index ff8529c9cec3..835233ff2b21 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -48,10 +48,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
index a42b81a75315..f509d100bdef 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
@@ -63,10 +63,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -90,10 +90,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_COLOR)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 79c43e0830e3..ed6db1e977ea 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -57,10 +57,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 215ff6c6d296..d7c2d2195534 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -57,10 +57,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
index 089744c80c72..f63be19bf414 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -65,10 +65,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
@@ -99,10 +99,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -134,10 +134,10 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java
index 4c9301e8f46b..475169d43685 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/BigCat.java
@@ -95,10 +95,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_KIND)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
index 5f5bc4e5e13e..ebadcde2477f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -65,10 +65,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
@@ -91,10 +91,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
@@ -117,10 +117,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
@@ -143,10 +143,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
@@ -169,10 +169,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
@@ -195,10 +195,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
index 8b71eba511fc..5608b56e527b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
@@ -59,10 +59,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
index 60260465b07d..6c3f81ab3f38 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
@@ -49,10 +49,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -75,10 +75,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
index cd47fe3dc45c..e7cacbfdd4f8 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -45,10 +45,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
index 1d03f2663f0f..d9e1badff7a9 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
@@ -45,10 +45,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
index f5bfe3dab962..89d8faf05db6 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
@@ -56,10 +56,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
index 0e1576d2385e..e4e75c3dc24d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -122,10 +122,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
@@ -156,10 +156,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
index 7598b7aaeab3..1f1b924c183d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -207,10 +207,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
@@ -233,10 +233,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -260,10 +260,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
@@ -286,10 +286,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
@@ -312,10 +312,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index b4a2061d6fdb..e9e1efbe7a5e 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -53,10 +53,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -88,10 +88,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
index 4a8f2ab60f48..8667cfabd099 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -103,12 +103,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @jakarta.annotation.Nullable
  @Min(10) @Max(100)
   @JsonProperty(JSON_PROPERTY_INTEGER)
@@ -131,12 +131,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @jakarta.annotation.Nullable
  @Min(20) @Max(200)
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -159,10 +159,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_INT64)
@@ -185,12 +185,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
   @Valid
@@ -215,12 +215,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @jakarta.annotation.Nullable
  @DecimalMin("54.3") @DecimalMax("987.6")
   @JsonProperty(JSON_PROPERTY_FLOAT)
@@ -243,12 +243,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @jakarta.annotation.Nullable
  @DecimalMin("67.8") @DecimalMax("123.4")
   @JsonProperty(JSON_PROPERTY_DOUBLE)
@@ -271,10 +271,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
   @JsonProperty(JSON_PROPERTY_STRING)
@@ -297,10 +297,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -324,10 +324,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -351,10 +351,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
   @Valid
@@ -379,10 +379,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -406,10 +406,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -433,10 +433,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
  @Size(min=10,max=64)
@@ -460,10 +460,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 08974b9fb64b..49e98950589f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -44,8 +44,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -56,10 +56,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -71,10 +71,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_FOO)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
index 88a24f63a0bf..c2ccbff44be1 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
@@ -102,10 +102,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -137,10 +137,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
@@ -171,10 +171,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
@@ -205,10 +205,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2a2c105f7cfd..0fd574cead1b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -58,10 +58,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -85,10 +85,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -120,10 +120,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
index af5fd578b5e7..abc7ba513ffe 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -50,10 +50,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -76,10 +76,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 67bad6f7e523..ebde6bff2430 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -54,10 +54,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -80,10 +80,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -106,10 +106,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java
index b6c60024bc1f..b2c1e812bf60 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -46,10 +46,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java
index 04a0ad81fd1f..c9a539c44779 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelList.java
@@ -46,10 +46,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_123LIST)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
index 5cdc0aa80862..fed7e65b20b7 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,10 +46,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
index ea1e85b85544..9d88abde0a96 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
@@ -51,8 +51,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -69,10 +69,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -90,10 +90,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
@@ -111,10 +111,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PROPERTY)
@@ -131,10 +131,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_123NUMBER)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
index 5314dd587bc6..4164ced1f0e2 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -46,10 +46,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
index 21cca07a23ac..88f96cae4c90 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
@@ -103,10 +103,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -129,10 +129,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -155,10 +155,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -181,10 +181,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -208,10 +208,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -234,10 +234,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
index dab6f0c951e4..314ef2ffbbab 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -54,10 +54,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -81,10 +81,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MY_STRING)
@@ -107,10 +107,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
index c8a01a1d20fe..a54e767ef188 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
@@ -110,10 +110,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -136,10 +136,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -163,10 +163,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -198,10 +198,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -234,10 +234,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -261,10 +261,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_STATUS)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index ad09344da507..15e5616f7e7b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -43,8 +43,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -53,10 +53,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -74,10 +74,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_BAZ)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 3290d874b4ff..ae83c490184b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -46,10 +46,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
index 215710a45aae..7b74de8ac105 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
@@ -49,10 +49,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -75,10 +75,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 9a7ed6af976b..72f8ce7caf2d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -65,10 +65,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -92,10 +92,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
   @Valid
@@ -120,10 +120,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -147,10 +147,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -182,10 +182,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index b504576b3e7d..94aeb770076a 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -69,10 +69,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -96,10 +96,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
   @Valid
@@ -124,10 +124,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -151,10 +151,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -178,10 +178,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
@@ -213,10 +213,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @jakarta.annotation.Nonnull
   @NotNull
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
index f7468329b426..0b01a2ed0203 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
@@ -73,10 +73,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ID)
@@ -99,10 +99,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -125,10 +125,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -151,10 +151,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -177,10 +177,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -203,10 +203,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -229,10 +229,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -255,10 +255,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
index 21184e26cfa0..79995f01c085 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -161,10 +161,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
@@ -187,10 +187,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -214,10 +214,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
@@ -240,10 +240,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
@@ -274,10 +274,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
@@ -300,10 +300,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_STRING)
@@ -326,10 +326,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -353,10 +353,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
@@ -379,10 +379,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
@@ -413,10 +413,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
@@ -447,10 +447,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
@@ -473,10 +473,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
@@ -499,10 +499,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -526,10 +526,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
@@ -552,10 +552,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
@@ -586,10 +586,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
@@ -620,10 +620,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
@@ -646,10 +646,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
@@ -672,10 +672,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -699,10 +699,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
@@ -725,10 +725,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
@@ -759,10 +759,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
@@ -793,10 +793,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
@@ -819,10 +819,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
@@ -845,10 +845,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @Valid
 
@@ -872,10 +872,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
@@ -898,10 +898,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
@@ -932,10 +932,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
@@ -966,10 +966,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @jakarta.annotation.Nullable
 
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index f175e4f8e950..3881ef9a6ab8 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index b84dd06f6e7b..2490dfbea7f5 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -44,10 +44,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 8c3fbab9dfa1..0bb8a54bebcc 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 4991b88d3374..ee342019dc19 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -92,10 +92,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, String> getMapString() {
@@ -121,10 +121,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, BigDecimal> getMapNumber() {
@@ -150,10 +150,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Integer> getMapInteger() {
@@ -179,10 +179,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getMapBoolean() {
@@ -208,10 +208,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -237,10 +237,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -266,10 +266,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, String>> getMapMapString() {
@@ -295,10 +295,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -316,10 +316,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype1() {
@@ -337,10 +337,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype2() {
@@ -358,10 +358,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 7a981d14364b..9ddf40ac65d1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 284a7a3a408e..f44788c319da 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -44,10 +44,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cabdb503a7bf..dd6e137c946d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index d8223ad9fa84..877739862052 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
index 9c84c9dd54d3..6226ded56287 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
@@ -44,10 +44,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getClassName() {
@@ -65,10 +65,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getColor() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 78dca7978fcb..8318bced60b0 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -52,10 +52,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index cc68125f9d4a..40618d8b1f22 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -52,10 +52,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 63fb178a742c..b4c7f6316920 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -60,10 +60,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getArrayOfString() {
@@ -89,10 +89,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -118,10 +118,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java
index ce5bf70e5452..399960dd107d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/BigCat.java
@@ -93,10 +93,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
 
   public KindEnum getKind() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
index 2ef3bf760c0b..d025b971dad4 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -60,10 +60,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSmallCamel() {
@@ -81,10 +81,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getCapitalCamel() {
@@ -102,10 +102,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSmallSnake() {
@@ -123,10 +123,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getCapitalSnake() {
@@ -144,10 +144,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getScAETHFlowPoints() {
@@ -165,10 +165,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getATTNAME() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
index a95e8f652c78..cf0df17a717f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,10 +42,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getDeclawed() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
index 7a91953e59ec..f9f4623b88ab 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
@@ -44,10 +44,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -65,10 +65,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
index 97e1c4fba07c..2d214463199d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -40,10 +40,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPropertyClass() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
index b3d48fc82292..305c74091f8a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
@@ -40,10 +40,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getClient() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
index 6e49cd677666..22629114e8e1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,10 +42,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBreed() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 81b9d9b1e159..0506daec7083 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -141,10 +141,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
 
   public JustSymbolEnum getJustSymbol() {
@@ -170,10 +170,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<ArrayEnumEnum> getArrayEnum() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
index 5154691322c6..dd77d390ff17 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -249,10 +249,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumStringEnum getEnumString() {
@@ -270,10 +270,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
 
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -291,10 +291,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumIntegerEnum getEnumInteger() {
@@ -312,10 +312,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumNumberEnum getEnumNumber() {
@@ -333,10 +333,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
 
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 92893c02b505..11a735bc01e7 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,10 +48,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
 
   public ModelFile getFile() {
@@ -77,10 +77,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<ModelFile> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
index 616e7f047f21..5bcd3444e7cc 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,12 +97,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getInteger() {
@@ -120,12 +120,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getInt32() {
@@ -143,10 +143,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getInt64() {
@@ -164,12 +164,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumber() {
@@ -187,12 +187,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
 
   public Float getFloat() {
@@ -210,12 +210,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
 
   public Double getDouble() {
@@ -233,10 +233,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getString() {
@@ -254,10 +254,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
 
   public byte[] getByte() {
@@ -275,10 +275,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
 
   public File getBinary() {
@@ -296,10 +296,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
 
   public LocalDate getDate() {
@@ -317,10 +317,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
@@ -338,10 +338,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
@@ -359,10 +359,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getPassword() {
@@ -380,10 +380,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getBigDecimal() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 58c82ce5d6a4..906bd685eb27 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,8 +38,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public HasOnlyReadOnly(
      String bar, 
@@ -50,10 +50,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBar() {
@@ -62,10 +62,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getFoo() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
index 84cc5578e0dc..c1581219310f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -109,10 +109,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -138,10 +138,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, InnerEnum> getMapOfEnumString() {
@@ -167,10 +167,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getDirectMap() {
@@ -196,10 +196,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getIndirectMap() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a4835ce4f654..872f6653c1ba 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -53,10 +53,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
@@ -74,10 +74,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
@@ -103,10 +103,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
index 83881fc7d722..55fc41cc4420 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,10 +44,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getName() {
@@ -65,10 +65,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPropertyClass() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index bfca955e8a02..1891d3935a3a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -48,10 +48,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getCode() {
@@ -69,10 +69,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getType() {
@@ -90,10 +90,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getMessage() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java
index 0645162994ee..84649b822689 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -40,10 +40,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSourceURI() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java
index 0be30cbaac2b..0bb49408d534 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelList.java
@@ -40,10 +40,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
 
   public String get123list() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 26e4a159b830..13d1f8053494 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -40,10 +40,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getReturn() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
index b79984a7208d..ad6901cd56c3 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
@@ -46,8 +46,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public Name(
      Integer snakeCase, 
@@ -64,10 +64,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getName() {
@@ -79,10 +79,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getSnakeCase() {
@@ -97,10 +97,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getProperty() {
@@ -112,10 +112,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer get123number() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
index e948fced9acf..57fc0f18fe8f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,10 +41,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
index ca8a048664f6..b6b5e36800f5 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
@@ -110,10 +110,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -131,10 +131,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getPetId() {
@@ -152,10 +152,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getQuantity() {
@@ -173,10 +173,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getShipDate() {
@@ -194,10 +194,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   public StatusEnum getStatus() {
@@ -215,10 +215,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getComplete() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
index ecb759b08828..1dca27b0caf2 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -49,10 +49,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getMyNumber() {
@@ -70,10 +70,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getMyString() {
@@ -91,10 +91,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getMyBoolean() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
index a4caf91e01df..3d4846ab0b77 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
@@ -116,10 +116,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -137,10 +137,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
 
   public Category getCategory() {
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getName() {
@@ -187,10 +187,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Set<String> getPhotoUrls() {
@@ -216,10 +216,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Tag> getTags() {
@@ -237,10 +237,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   public StatusEnum getStatus() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 8d38bc84eb8a..b436815d817e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,8 +38,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public ReadOnlyFirst(
      String bar
@@ -48,10 +48,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBar() {
@@ -66,10 +66,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBaz() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8564ee04bd65..a55d676327f2 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,10 +40,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long get$SpecialPropertyName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
index 8421f94e4b81..478366c8c74f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
@@ -44,10 +44,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -65,10 +65,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index ca63e55bff60..9b773d878f97 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -60,10 +60,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getStringItem() {
@@ -81,10 +81,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumberItem() {
@@ -102,10 +102,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getIntegerItem() {
@@ -123,10 +123,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Boolean getBoolItem() {
@@ -152,10 +152,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index ec74900f6a63..fe1f74d73442 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -64,10 +64,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getStringItem() {
@@ -85,10 +85,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumberItem() {
@@ -106,10 +106,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Float getFloatItem() {
@@ -127,10 +127,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getIntegerItem() {
@@ -148,10 +148,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Boolean getBoolItem() {
@@ -177,10 +177,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
index 936feced2f5c..96243a00dafe 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
@@ -68,10 +68,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -89,10 +89,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getUsername() {
@@ -110,10 +110,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getFirstName() {
@@ -131,10 +131,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getLastName() {
@@ -152,10 +152,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getEmail() {
@@ -173,10 +173,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPassword() {
@@ -194,10 +194,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPhone() {
@@ -215,10 +215,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getUserStatus() {
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
index 9d2721a23479..d6d590a40d2b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -156,10 +156,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getAttributeString() {
@@ -177,10 +177,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getAttributeNumber() {
@@ -198,10 +198,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getAttributeInteger() {
@@ -219,10 +219,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getAttributeBoolean() {
@@ -248,10 +248,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getWrappedArray() {
@@ -269,10 +269,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getNameString() {
@@ -290,10 +290,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getNameNumber() {
@@ -311,10 +311,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getNameInteger() {
@@ -332,10 +332,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getNameBoolean() {
@@ -361,10 +361,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNameArray() {
@@ -390,10 +390,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNameWrappedArray() {
@@ -411,10 +411,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPrefixString() {
@@ -432,10 +432,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getPrefixNumber() {
@@ -453,10 +453,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getPrefixInteger() {
@@ -474,10 +474,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getPrefixBoolean() {
@@ -503,10 +503,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixArray() {
@@ -532,10 +532,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixWrappedArray() {
@@ -553,10 +553,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getNamespaceString() {
@@ -574,10 +574,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getNamespaceNumber() {
@@ -595,10 +595,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getNamespaceInteger() {
@@ -616,10 +616,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getNamespaceBoolean() {
@@ -645,10 +645,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNamespaceArray() {
@@ -674,10 +674,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNamespaceWrappedArray() {
@@ -695,10 +695,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPrefixNsString() {
@@ -716,10 +716,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getPrefixNsNumber() {
@@ -737,10 +737,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getPrefixNsInteger() {
@@ -758,10 +758,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getPrefixNsBoolean() {
@@ -787,10 +787,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixNsArray() {
@@ -816,10 +816,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixNsWrappedArray() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index f175e4f8e950..3881ef9a6ab8 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index b84dd06f6e7b..2490dfbea7f5 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -44,10 +44,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 8c3fbab9dfa1..0bb8a54bebcc 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 4991b88d3374..ee342019dc19 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -92,10 +92,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, String> getMapString() {
@@ -121,10 +121,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, BigDecimal> getMapNumber() {
@@ -150,10 +150,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Integer> getMapInteger() {
@@ -179,10 +179,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getMapBoolean() {
@@ -208,10 +208,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -237,10 +237,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -266,10 +266,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, String>> getMapMapString() {
@@ -295,10 +295,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -316,10 +316,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype1() {
@@ -337,10 +337,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype2() {
@@ -358,10 +358,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 7a981d14364b..9ddf40ac65d1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 284a7a3a408e..f44788c319da 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -44,10 +44,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cabdb503a7bf..dd6e137c946d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index d8223ad9fa84..877739862052 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
index 9c84c9dd54d3..6226ded56287 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
@@ -44,10 +44,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getClassName() {
@@ -65,10 +65,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getColor() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 78dca7978fcb..8318bced60b0 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -52,10 +52,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index cc68125f9d4a..40618d8b1f22 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -52,10 +52,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 63fb178a742c..b4c7f6316920 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -60,10 +60,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getArrayOfString() {
@@ -89,10 +89,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -118,10 +118,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java
index ce5bf70e5452..399960dd107d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/BigCat.java
@@ -93,10 +93,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
 
   public KindEnum getKind() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
index 2ef3bf760c0b..d025b971dad4 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -60,10 +60,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSmallCamel() {
@@ -81,10 +81,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getCapitalCamel() {
@@ -102,10 +102,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSmallSnake() {
@@ -123,10 +123,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getCapitalSnake() {
@@ -144,10 +144,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getScAETHFlowPoints() {
@@ -165,10 +165,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getATTNAME() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
index a95e8f652c78..cf0df17a717f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,10 +42,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getDeclawed() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
index 7a91953e59ec..f9f4623b88ab 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
@@ -44,10 +44,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -65,10 +65,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
index 97e1c4fba07c..2d214463199d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -40,10 +40,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPropertyClass() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
index b3d48fc82292..305c74091f8a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
@@ -40,10 +40,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getClient() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
index 6e49cd677666..22629114e8e1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,10 +42,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBreed() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 81b9d9b1e159..0506daec7083 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -141,10 +141,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
 
   public JustSymbolEnum getJustSymbol() {
@@ -170,10 +170,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<ArrayEnumEnum> getArrayEnum() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
index 5154691322c6..dd77d390ff17 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -249,10 +249,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumStringEnum getEnumString() {
@@ -270,10 +270,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
 
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -291,10 +291,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumIntegerEnum getEnumInteger() {
@@ -312,10 +312,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumNumberEnum getEnumNumber() {
@@ -333,10 +333,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
 
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 92893c02b505..11a735bc01e7 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,10 +48,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
 
   public ModelFile getFile() {
@@ -77,10 +77,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<ModelFile> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
index 616e7f047f21..5bcd3444e7cc 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,12 +97,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getInteger() {
@@ -120,12 +120,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getInt32() {
@@ -143,10 +143,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getInt64() {
@@ -164,12 +164,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumber() {
@@ -187,12 +187,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
 
   public Float getFloat() {
@@ -210,12 +210,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
 
   public Double getDouble() {
@@ -233,10 +233,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getString() {
@@ -254,10 +254,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
 
   public byte[] getByte() {
@@ -275,10 +275,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
 
   public File getBinary() {
@@ -296,10 +296,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
 
   public LocalDate getDate() {
@@ -317,10 +317,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
@@ -338,10 +338,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
@@ -359,10 +359,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getPassword() {
@@ -380,10 +380,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getBigDecimal() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 58c82ce5d6a4..906bd685eb27 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,8 +38,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public HasOnlyReadOnly(
      String bar, 
@@ -50,10 +50,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBar() {
@@ -62,10 +62,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getFoo() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
index 84cc5578e0dc..c1581219310f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -109,10 +109,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -138,10 +138,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, InnerEnum> getMapOfEnumString() {
@@ -167,10 +167,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getDirectMap() {
@@ -196,10 +196,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getIndirectMap() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a4835ce4f654..872f6653c1ba 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -53,10 +53,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
@@ -74,10 +74,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
@@ -103,10 +103,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
index 83881fc7d722..55fc41cc4420 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,10 +44,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getName() {
@@ -65,10 +65,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPropertyClass() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index bfca955e8a02..1891d3935a3a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -48,10 +48,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getCode() {
@@ -69,10 +69,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getType() {
@@ -90,10 +90,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getMessage() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java
index 0645162994ee..84649b822689 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -40,10 +40,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSourceURI() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java
index 0be30cbaac2b..0bb49408d534 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelList.java
@@ -40,10 +40,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
 
   public String get123list() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 26e4a159b830..13d1f8053494 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -40,10 +40,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getReturn() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
index b79984a7208d..ad6901cd56c3 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
@@ -46,8 +46,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public Name(
      Integer snakeCase, 
@@ -64,10 +64,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getName() {
@@ -79,10 +79,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getSnakeCase() {
@@ -97,10 +97,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getProperty() {
@@ -112,10 +112,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer get123number() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
index e948fced9acf..57fc0f18fe8f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,10 +41,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
index ca8a048664f6..b6b5e36800f5 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
@@ -110,10 +110,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -131,10 +131,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getPetId() {
@@ -152,10 +152,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getQuantity() {
@@ -173,10 +173,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getShipDate() {
@@ -194,10 +194,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   public StatusEnum getStatus() {
@@ -215,10 +215,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getComplete() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
index ecb759b08828..1dca27b0caf2 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -49,10 +49,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getMyNumber() {
@@ -70,10 +70,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getMyString() {
@@ -91,10 +91,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getMyBoolean() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
index a4caf91e01df..3d4846ab0b77 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
@@ -116,10 +116,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -137,10 +137,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
 
   public Category getCategory() {
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getName() {
@@ -187,10 +187,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Set<String> getPhotoUrls() {
@@ -216,10 +216,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Tag> getTags() {
@@ -237,10 +237,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   public StatusEnum getStatus() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 8d38bc84eb8a..b436815d817e 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,8 +38,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public ReadOnlyFirst(
      String bar
@@ -48,10 +48,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBar() {
@@ -66,10 +66,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBaz() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8564ee04bd65..a55d676327f2 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,10 +40,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long get$SpecialPropertyName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
index 8421f94e4b81..478366c8c74f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
@@ -44,10 +44,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -65,10 +65,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index ca63e55bff60..9b773d878f97 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -60,10 +60,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getStringItem() {
@@ -81,10 +81,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumberItem() {
@@ -102,10 +102,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getIntegerItem() {
@@ -123,10 +123,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Boolean getBoolItem() {
@@ -152,10 +152,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index ec74900f6a63..fe1f74d73442 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -64,10 +64,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getStringItem() {
@@ -85,10 +85,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumberItem() {
@@ -106,10 +106,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Float getFloatItem() {
@@ -127,10 +127,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getIntegerItem() {
@@ -148,10 +148,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Boolean getBoolItem() {
@@ -177,10 +177,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
index 936feced2f5c..96243a00dafe 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
@@ -68,10 +68,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -89,10 +89,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getUsername() {
@@ -110,10 +110,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getFirstName() {
@@ -131,10 +131,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getLastName() {
@@ -152,10 +152,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getEmail() {
@@ -173,10 +173,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPassword() {
@@ -194,10 +194,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPhone() {
@@ -215,10 +215,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getUserStatus() {
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
index 9d2721a23479..d6d590a40d2b 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -156,10 +156,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getAttributeString() {
@@ -177,10 +177,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getAttributeNumber() {
@@ -198,10 +198,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getAttributeInteger() {
@@ -219,10 +219,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getAttributeBoolean() {
@@ -248,10 +248,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getWrappedArray() {
@@ -269,10 +269,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getNameString() {
@@ -290,10 +290,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getNameNumber() {
@@ -311,10 +311,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getNameInteger() {
@@ -332,10 +332,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getNameBoolean() {
@@ -361,10 +361,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNameArray() {
@@ -390,10 +390,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNameWrappedArray() {
@@ -411,10 +411,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPrefixString() {
@@ -432,10 +432,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getPrefixNumber() {
@@ -453,10 +453,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getPrefixInteger() {
@@ -474,10 +474,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getPrefixBoolean() {
@@ -503,10 +503,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixArray() {
@@ -532,10 +532,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixWrappedArray() {
@@ -553,10 +553,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getNamespaceString() {
@@ -574,10 +574,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getNamespaceNumber() {
@@ -595,10 +595,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getNamespaceInteger() {
@@ -616,10 +616,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getNamespaceBoolean() {
@@ -645,10 +645,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNamespaceArray() {
@@ -674,10 +674,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNamespaceWrappedArray() {
@@ -695,10 +695,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPrefixNsString() {
@@ -716,10 +716,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getPrefixNsNumber() {
@@ -737,10 +737,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getPrefixNsInteger() {
@@ -758,10 +758,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getPrefixNsBoolean() {
@@ -787,10 +787,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixNsArray() {
@@ -816,10 +816,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixNsWrappedArray() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index f175e4f8e950..3881ef9a6ab8 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index b84dd06f6e7b..2490dfbea7f5 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -44,10 +44,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 8c3fbab9dfa1..0bb8a54bebcc 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 4991b88d3374..ee342019dc19 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -92,10 +92,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, String> getMapString() {
@@ -121,10 +121,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, BigDecimal> getMapNumber() {
@@ -150,10 +150,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Integer> getMapInteger() {
@@ -179,10 +179,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getMapBoolean() {
@@ -208,10 +208,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -237,10 +237,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -266,10 +266,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, String>> getMapMapString() {
@@ -295,10 +295,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -316,10 +316,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype1() {
@@ -337,10 +337,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype2() {
@@ -358,10 +358,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
 
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 7a981d14364b..9ddf40ac65d1 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 284a7a3a408e..f44788c319da 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -44,10 +44,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cabdb503a7bf..dd6e137c946d 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index d8223ad9fa84..877739862052 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -43,10 +43,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java
index 9c84c9dd54d3..6226ded56287 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Animal.java
@@ -44,10 +44,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getClassName() {
@@ -65,10 +65,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getColor() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 78dca7978fcb..8318bced60b0 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -52,10 +52,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index cc68125f9d4a..40618d8b1f22 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -52,10 +52,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java
index 63fb178a742c..b4c7f6316920 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -60,10 +60,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<String> getArrayOfString() {
@@ -89,10 +89,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -118,10 +118,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java
index ce5bf70e5452..399960dd107d 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/BigCat.java
@@ -93,10 +93,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
 
   public KindEnum getKind() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java
index 2ef3bf760c0b..d025b971dad4 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -60,10 +60,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSmallCamel() {
@@ -81,10 +81,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getCapitalCamel() {
@@ -102,10 +102,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSmallSnake() {
@@ -123,10 +123,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getCapitalSnake() {
@@ -144,10 +144,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getScAETHFlowPoints() {
@@ -165,10 +165,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getATTNAME() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java
index a95e8f652c78..cf0df17a717f 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,10 +42,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getDeclawed() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java
index 7a91953e59ec..f9f4623b88ab 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Category.java
@@ -44,10 +44,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -65,10 +65,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java
index 97e1c4fba07c..2d214463199d 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -40,10 +40,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPropertyClass() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java
index b3d48fc82292..305c74091f8a 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Client.java
@@ -40,10 +40,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getClient() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java
index 6e49cd677666..22629114e8e1 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,10 +42,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBreed() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java
index 81b9d9b1e159..0506daec7083 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -141,10 +141,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
 
   public JustSymbolEnum getJustSymbol() {
@@ -170,10 +170,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<ArrayEnumEnum> getArrayEnum() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
index 5154691322c6..dd77d390ff17 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -249,10 +249,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumStringEnum getEnumString() {
@@ -270,10 +270,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
 
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -291,10 +291,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumIntegerEnum getEnumInteger() {
@@ -312,10 +312,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public EnumNumberEnum getEnumNumber() {
@@ -333,10 +333,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
 
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 92893c02b505..11a735bc01e7 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,10 +48,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
 
   public ModelFile getFile() {
@@ -77,10 +77,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<ModelFile> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
index 616e7f047f21..5bcd3444e7cc 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,12 +97,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getInteger() {
@@ -120,12 +120,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getInt32() {
@@ -143,10 +143,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getInt64() {
@@ -164,12 +164,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumber() {
@@ -187,12 +187,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
 
   public Float getFloat() {
@@ -210,12 +210,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
 
   public Double getDouble() {
@@ -233,10 +233,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getString() {
@@ -254,10 +254,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
 
   public byte[] getByte() {
@@ -275,10 +275,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
 
   public File getBinary() {
@@ -296,10 +296,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
 
   public LocalDate getDate() {
@@ -317,10 +317,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
@@ -338,10 +338,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
@@ -359,10 +359,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getPassword() {
@@ -380,10 +380,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getBigDecimal() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 58c82ce5d6a4..906bd685eb27 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,8 +38,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public HasOnlyReadOnly(
      String bar, 
@@ -50,10 +50,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBar() {
@@ -62,10 +62,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getFoo() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java
index 84cc5578e0dc..c1581219310f 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MapTest.java
@@ -109,10 +109,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -138,10 +138,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, InnerEnum> getMapOfEnumString() {
@@ -167,10 +167,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getDirectMap() {
@@ -196,10 +196,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Boolean> getIndirectMap() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a4835ce4f654..872f6653c1ba 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -53,10 +53,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
@@ -74,10 +74,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
@@ -103,10 +103,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
 
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java
index 83881fc7d722..55fc41cc4420 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,10 +44,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getName() {
@@ -65,10 +65,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPropertyClass() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index bfca955e8a02..1891d3935a3a 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -48,10 +48,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getCode() {
@@ -69,10 +69,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getType() {
@@ -90,10 +90,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getMessage() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java
index 0645162994ee..84649b822689 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -40,10 +40,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getSourceURI() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java
index 0be30cbaac2b..0bb49408d534 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelList.java
@@ -40,10 +40,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
 
   public String get123list() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java
index 26e4a159b830..13d1f8053494 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -40,10 +40,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getReturn() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java
index b79984a7208d..ad6901cd56c3 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Name.java
@@ -46,8 +46,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public Name(
      Integer snakeCase, 
@@ -64,10 +64,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getName() {
@@ -79,10 +79,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getSnakeCase() {
@@ -97,10 +97,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getProperty() {
@@ -112,10 +112,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer get123number() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java
index e948fced9acf..57fc0f18fe8f 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,10 +41,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java
index ca8a048664f6..b6b5e36800f5 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Order.java
@@ -110,10 +110,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -131,10 +131,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getPetId() {
@@ -152,10 +152,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getQuantity() {
@@ -173,10 +173,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
 
   public OffsetDateTime getShipDate() {
@@ -194,10 +194,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   public StatusEnum getStatus() {
@@ -215,10 +215,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getComplete() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java
index ecb759b08828..1dca27b0caf2 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -49,10 +49,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getMyNumber() {
@@ -70,10 +70,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getMyString() {
@@ -91,10 +91,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getMyBoolean() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java
index a4caf91e01df..3d4846ab0b77 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Pet.java
@@ -116,10 +116,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -137,10 +137,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
 
   public Category getCategory() {
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getName() {
@@ -187,10 +187,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Set<String> getPhotoUrls() {
@@ -216,10 +216,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Tag> getTags() {
@@ -237,10 +237,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
 
   public StatusEnum getStatus() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 8d38bc84eb8a..b436815d817e 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,8 +38,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   
   public ReadOnlyFirst(
      String bar
@@ -48,10 +48,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBar() {
@@ -66,10 +66,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getBaz() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8564ee04bd65..a55d676327f2 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,10 +40,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long get$SpecialPropertyName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java
index 8421f94e4b81..478366c8c74f 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/Tag.java
@@ -44,10 +44,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -65,10 +65,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index ca63e55bff60..9b773d878f97 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -60,10 +60,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getStringItem() {
@@ -81,10 +81,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumberItem() {
@@ -102,10 +102,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getIntegerItem() {
@@ -123,10 +123,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Boolean getBoolItem() {
@@ -152,10 +152,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index ec74900f6a63..fe1f74d73442 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -64,10 +64,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public String getStringItem() {
@@ -85,10 +85,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public BigDecimal getNumberItem() {
@@ -106,10 +106,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Float getFloatItem() {
@@ -127,10 +127,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Integer getIntegerItem() {
@@ -148,10 +148,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public Boolean getBoolItem() {
@@ -177,10 +177,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
 
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java
index 936feced2f5c..96243a00dafe 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/User.java
@@ -68,10 +68,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
 
   public Long getId() {
@@ -89,10 +89,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getUsername() {
@@ -110,10 +110,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getFirstName() {
@@ -131,10 +131,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getLastName() {
@@ -152,10 +152,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getEmail() {
@@ -173,10 +173,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPassword() {
@@ -194,10 +194,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPhone() {
@@ -215,10 +215,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getUserStatus() {
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java
index 9d2721a23479..d6d590a40d2b 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -156,10 +156,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getAttributeString() {
@@ -177,10 +177,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getAttributeNumber() {
@@ -198,10 +198,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getAttributeInteger() {
@@ -219,10 +219,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getAttributeBoolean() {
@@ -248,10 +248,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getWrappedArray() {
@@ -269,10 +269,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getNameString() {
@@ -290,10 +290,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getNameNumber() {
@@ -311,10 +311,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getNameInteger() {
@@ -332,10 +332,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getNameBoolean() {
@@ -361,10 +361,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNameArray() {
@@ -390,10 +390,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNameWrappedArray() {
@@ -411,10 +411,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPrefixString() {
@@ -432,10 +432,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getPrefixNumber() {
@@ -453,10 +453,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getPrefixInteger() {
@@ -474,10 +474,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getPrefixBoolean() {
@@ -503,10 +503,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixArray() {
@@ -532,10 +532,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixWrappedArray() {
@@ -553,10 +553,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getNamespaceString() {
@@ -574,10 +574,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getNamespaceNumber() {
@@ -595,10 +595,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getNamespaceInteger() {
@@ -616,10 +616,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getNamespaceBoolean() {
@@ -645,10 +645,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNamespaceArray() {
@@ -674,10 +674,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getNamespaceWrappedArray() {
@@ -695,10 +695,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
 
   public String getPrefixNsString() {
@@ -716,10 +716,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
 
   public BigDecimal getPrefixNsNumber() {
@@ -737,10 +737,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
 
   public Integer getPrefixNsInteger() {
@@ -758,10 +758,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
 
   public Boolean getPrefixNsBoolean() {
@@ -787,10 +787,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixNsArray() {
@@ -816,10 +816,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
 
   public List<Integer> getPrefixNsWrappedArray() {
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1b31237f523c..f2a19d779d16 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesAnyType name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 715fab6e6e6a..449e5872388a 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -47,10 +47,10 @@ public AdditionalPropertiesArray name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 927daf906c7c..29334015b743 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesBoolean name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3cef9787b6f3..94c637ae6b0a 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -95,10 +95,10 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
     return this;
   }
 
-   /**
+  /**
    * Get mapString
    * @return mapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,10 +128,10 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
     return this;
   }
 
-   /**
+  /**
    * Get mapNumber
    * @return mapNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -161,10 +161,10 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
     return this;
   }
 
-   /**
+  /**
    * Get mapInteger
    * @return mapInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -194,10 +194,10 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
     return this;
   }
 
-   /**
+  /**
    * Get mapBoolean
    * @return mapBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -227,10 +227,10 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -260,10 +260,10 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
     return this;
   }
 
-   /**
+  /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_ARRAY_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
     return this;
   }
 
-   /**
+  /**
    * Get mapMapString
    * @return mapMapString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -326,10 +326,10 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
     return this;
   }
 
-   /**
+  /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_ANYTYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -351,10 +351,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -376,10 +376,10 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype2
    * @return anytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -401,10 +401,10 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype3
    * @return anytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ANYTYPE3)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 484ed041f341..704e1162e17a 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesInteger name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index e2273e44104a..24e76bef37a6 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -47,10 +47,10 @@ public AdditionalPropertiesNumber name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c6b3d48fd998..4caced23dd8f 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 962b40afefe9..160d00975351 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -46,10 +46,10 @@ public AdditionalPropertiesString name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java
index ecb642ee812a..62697dfdebfb 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Animal.java
@@ -61,10 +61,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 9e972837b116..8feb9e018903 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 761e0f6c9d17..23629d1da5ae 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java
index 46a6df1e4e34..e09e6bd4797a 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java
index f539e6ba794d..e425a49e8305 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/BigCat.java
@@ -93,10 +93,10 @@ public BigCat kind(KindEnum kind) {
     return this;
   }
 
-   /**
+  /**
    * Get kind
    * @return kind
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_KIND)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java
index 3a82316cd11f..c5d6b86b6c69 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,10 +88,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java
index 6a03004859ea..3539a9ef8a53 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Cat.java
@@ -57,10 +57,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java
index e9daed894ab8..7c9d93682b1e 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java
index faeaf6d170f7..f855164463ba 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java
index 4addbe634b17..50cca186dccf 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java
index 78b64eaa57db..21bdbf6ac3ac 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java
index 0d4340977e8c..01f7885a0fff 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
index 2c8546c4012d..22bb97c598a2 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -205,10 +205,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -230,10 +230,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -255,10 +255,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -280,10 +280,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -305,10 +305,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c75f077d859..b3e7387cf6dc 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
index a767541b1e5c..8a2d8ceea0ec 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -101,12 +101,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,12 +128,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -155,10 +155,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -180,12 +180,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -207,12 +207,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -234,12 +234,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -261,10 +261,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -286,10 +286,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -311,10 +311,10 @@ public FormatTest binary(AsyncFile binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -336,10 +336,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -361,10 +361,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -386,10 +386,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -411,10 +411,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -436,10 +436,10 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
     return this;
   }
 
-   /**
+  /**
    * Get bigDecimal
    * @return bigDecimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4e3d9aa3c7ec..2f46a0e85d02 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java
index 6a80971630f8..b0bb9fcb82de 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MapTest.java
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2cd1a36939b8..b9ab922abe22 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -114,10 +114,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java
index 999b5e34446b..2a18245f5f79 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 19b3b2e5b411..1f13412355b8 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java
index 065dbc19bb0b..822fea6c2327 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -44,10 +44,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java
index 432cbfd18ee1..a8fb60cdfc2c 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java
index 491491e42994..669b30691c79 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java
index 1168630509be..3b165e7570c7 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9b8575bb5aa3..8625f00c8741 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java
index 198c4705b48d..0fc8d456873f 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -151,10 +151,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5bbc97e9f32c..4adb1bc59812 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java
index ef0a788e0e09..97d3f950180f 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -225,10 +225,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4a4070939629..fa8bdd64bc96 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f3c375404656..a659a8f7aa57 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java
index a6b72d921a6a..518116d43ce5 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index a22e61772b50..260b47da9906 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -63,10 +63,10 @@ public TypeHolderDefault stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -88,10 +88,10 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -113,10 +113,10 @@ public TypeHolderDefault integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -138,10 +138,10 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -171,10 +171,10 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 58917832eeb3..d7ee132c0718 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -67,10 +67,10 @@ public TypeHolderExample stringItem(String stringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get stringItem
    * @return stringItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_STRING_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -92,10 +92,10 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get numberItem
    * @return numberItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -117,10 +117,10 @@ public TypeHolderExample floatItem(Float floatItem) {
     return this;
   }
 
-   /**
+  /**
    * Get floatItem
    * @return floatItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_FLOAT_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -142,10 +142,10 @@ public TypeHolderExample integerItem(Integer integerItem) {
     return this;
   }
 
-   /**
+  /**
    * Get integerItem
    * @return integerItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_INTEGER_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -167,10 +167,10 @@ public TypeHolderExample boolItem(Boolean boolItem) {
     return this;
   }
 
-   /**
+  /**
    * Get boolItem
    * @return boolItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BOOL_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -200,10 +200,10 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItem
    * @return arrayItem
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java
index 2c0f53742f0a..2ecb4b0fbb3e 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -146,10 +146,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -171,10 +171,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java
index 36b3618cb318..91a1c08a1da3 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -159,10 +159,10 @@ public XmlItem attributeString(String attributeString) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeString
    * @return attributeString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -184,10 +184,10 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeNumber
    * @return attributeNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -209,10 +209,10 @@ public XmlItem attributeInteger(Integer attributeInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeInteger
    * @return attributeInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -234,10 +234,10 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get attributeBoolean
    * @return attributeBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ATTRIBUTE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -267,10 +267,10 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get wrappedArray
    * @return wrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -292,10 +292,10 @@ public XmlItem nameString(String nameString) {
     return this;
   }
 
-   /**
+  /**
    * Get nameString
    * @return nameString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -317,10 +317,10 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get nameNumber
    * @return nameNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -342,10 +342,10 @@ public XmlItem nameInteger(Integer nameInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get nameInteger
    * @return nameInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -367,10 +367,10 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get nameBoolean
    * @return nameBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -400,10 +400,10 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameArray
    * @return nameArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -433,10 +433,10 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -458,10 +458,10 @@ public XmlItem prefixString(String prefixString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixString
    * @return prefixString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -483,10 +483,10 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNumber
    * @return prefixNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -508,10 +508,10 @@ public XmlItem prefixInteger(Integer prefixInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixInteger
    * @return prefixInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -533,10 +533,10 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixBoolean
    * @return prefixBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -566,10 +566,10 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixArray
    * @return prefixArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -599,10 +599,10 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -624,10 +624,10 @@ public XmlItem namespaceString(String namespaceString) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceString
    * @return namespaceString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -649,10 +649,10 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceNumber
    * @return namespaceNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -674,10 +674,10 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceInteger
    * @return namespaceInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -699,10 +699,10 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -732,10 +732,10 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceArray
    * @return namespaceArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -765,10 +765,10 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAMESPACE_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -790,10 +790,10 @@ public XmlItem prefixNsString(String prefixNsString) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsString
    * @return prefixNsString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -815,10 +815,10 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -840,10 +840,10 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -865,10 +865,10 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -898,10 +898,10 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsArray
    * @return prefixNsArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -931,10 +931,10 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
     return this;
   }
 
-   /**
+  /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PREFIX_NS_WRAPPED_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/vertx/api/openapi.yaml
+++ b/samples/client/petstore/java/vertx/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 55ac934f528b..a09d11d7474a 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 3a557c2aca7d..52f5f3da6424 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -48,10 +48,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
index 9c7596b2cfb0..fb8060948c5f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
@@ -60,10 +60,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -85,10 +85,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 9e972837b116..8feb9e018903 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 761e0f6c9d17..23629d1da5ae 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
index 46a6df1e4e34..e09e6bd4797a 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
index 3a82316cd11f..c5d6b86b6c69 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,10 +88,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
index 797d453b5457..36e096184ddf 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
@@ -54,10 +54,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
index e9daed894ab8..7c9d93682b1e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 07632d8f36dd..54c8da1f850f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -55,10 +55,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
index faeaf6d170f7..f855164463ba 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
index 4addbe634b17..50cca186dccf 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index e4f4e82aa533..9c42cffb7601 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -45,10 +45,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
index 78b64eaa57db..21bdbf6ac3ac 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
index 0d4340977e8c..01f7885a0fff 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
index 0e4e6a0540ad..1c109d2dd9d2 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -224,10 +224,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -249,10 +249,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -274,10 +274,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -299,10 +299,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -324,10 +324,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -357,10 +357,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -382,10 +382,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -407,10 +407,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index db226a749a16..107e913f66d2 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -51,10 +51,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c75f077d859..b3e7387cf6dc 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Foo.java
index 19172be87d0c..15d16a3010e7 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Foo.java
@@ -43,10 +43,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 24fe1cafa473..a36cf7426541 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -45,10 +45,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
index 5b2af186b4c7..ed98b8d8e537 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -109,12 +109,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -136,12 +136,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,12 +188,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -215,12 +215,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -242,12 +242,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -269,10 +269,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -294,10 +294,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -319,10 +319,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -344,10 +344,10 @@ public FormatTest binary(AsyncFile binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -369,10 +369,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -394,10 +394,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -419,10 +419,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -444,10 +444,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -469,10 +469,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -494,10 +494,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4e3d9aa3c7ec..2f46a0e85d02 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index d556badbc86b..e7e4e4ca5c6d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -47,10 +47,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
index 6a80971630f8..b0bb9fcb82de 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2cd1a36939b8..b9ab922abe22 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -114,10 +114,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
index 999b5e34446b..2a18245f5f79 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 19b3b2e5b411..1f13412355b8 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java
index 065dbc19bb0b..822fea6c2327 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -44,10 +44,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java
index 432cbfd18ee1..a8fb60cdfc2c 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
index 491491e42994..669b30691c79 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
index 1168630509be..3b165e7570c7 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NullableClass.java
index 354ea5db5101..3dedffa20417 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -100,10 +100,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -133,10 +133,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -166,10 +166,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -199,10 +199,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -232,10 +232,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -265,10 +265,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -310,10 +310,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -355,10 +355,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -396,10 +396,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -433,10 +433,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -478,10 +478,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -519,10 +519,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9b8575bb5aa3..8625f00c8741 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 8259facc6e12..d2ec47f7f4a9 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -60,10 +60,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,11 +85,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -112,11 +112,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -147,11 +147,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
index 198c4705b48d..0fc8d456873f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -151,10 +151,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5bbc97e9f32c..4adb1bc59812 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index d94b304fbc88..ea419cb7df38 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -44,10 +44,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 427b0421acd8..642875630cf2 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -96,10 +96,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
index ef0a788e0e09..97d3f950180f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -225,10 +225,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4a4070939629..fa8bdd64bc96 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
index ddf6739e77ef..7d8ea856dd38 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
index a6b72d921a6a..518116d43ce5 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index dd167049f5bd..6b7f560ebb28 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -47,10 +47,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
index 2c0f53742f0a..2ecb4b0fbb3e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -146,10 +146,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -171,10 +171,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index c8690d50ba6f..f3e12e0fde57 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index cc37c9dc944b..f51dbeed4e0c 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -48,10 +48,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java
index de09fd3da2a0..e40d279162fd 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Animal.java
@@ -60,10 +60,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -85,10 +85,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 1d0acfd27ec6..7d499a1107ca 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 994e38edeab9..3f533f2c08c8 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java
index 203cd242045b..032de8c2e6c2 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java
index 0954957b128a..5a8de7bfd2a3 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,10 +88,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java
index 62f28fcc3b0c..b7c545ceba6f 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Cat.java
@@ -54,10 +54,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java
index 5c8a22840470..acb312fda305 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 0bf486675508..fa4b636be560 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -55,10 +55,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java
index daeb72031209..fe3a8f793621 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java
index 08272925589a..173665a09858 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index fd56383f5e92..30e9b06a7ab1 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -45,10 +45,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java
index 84aafd72053b..8b1a3a2a9881 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java
index 9eec62d0e88a..dd5790ce1bba 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java
index 0da1003337c4..7b148a8d48a9 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -224,10 +224,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -249,10 +249,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -274,10 +274,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -299,10 +299,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -324,10 +324,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -357,10 +357,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -382,10 +382,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -407,10 +407,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index 9a6698c8809c..953005d06088 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -51,10 +51,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3a3769d146e5..a9a6de91f76e 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java
index 0872af847353..608a54229901 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Foo.java
@@ -43,10 +43,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 90df79653214..cb2ea0695859 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -45,10 +45,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java
index 6dee29e00f4c..4261f74bac20 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -109,12 +109,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -136,12 +136,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,12 +188,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -215,12 +215,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -242,12 +242,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -269,10 +269,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -294,10 +294,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -319,10 +319,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -344,10 +344,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -369,10 +369,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -394,10 +394,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -419,10 +419,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -444,10 +444,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -469,10 +469,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -494,10 +494,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index e06f79f4f24d..3a5a8bdf084e 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index daca648321fd..f8606cebc05d 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -47,10 +47,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java
index 9b2ad1630e27..c36163c1e503 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MapTest.java
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index dc908e38a32c..03f70e7a8f42 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -114,10 +114,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java
index 1060a1be1c69..3cf913f9b054 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ef124b02157b..2f085200ae14 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java
index 32f359eb1061..787767e06e64 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -44,10 +44,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java
index bf4d8691d8e3..442c9b12532d 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java
index f02d51efb230..e9674f575b71 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java
index 22983a12c82a..0f1d2b42915a 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 7da923194723..1e5581a2cccd 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
@@ -100,10 +100,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -133,10 +133,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -166,10 +166,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -199,10 +199,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -232,10 +232,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -265,10 +265,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -310,10 +310,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -355,10 +355,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -396,10 +396,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -433,10 +433,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -478,10 +478,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
@@ -519,10 +519,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java
index 8873121fd79e..b9d9fcb03f91 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 63c3ab74e080..18848db9e424 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -60,10 +60,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,11 +85,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -112,11 +112,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -147,11 +147,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
index ab12669f2bcb..36d5522f86e4 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -151,10 +151,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java
index 98a1b40bccef..92bfe10f0a25 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index e312dc411150..97ae01106795 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -44,10 +44,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index ed98b677eb32..bec93c7259f5 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -96,10 +96,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java
index 121269c65087..41cffd9b6608 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Pet.java
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -225,10 +225,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4ff7f3db6440..7c0f95400978 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java
index d4dbf6dc2e22..dcbfb88f8a2c 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java
index 2c2851098a93..82c4b33b7534 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index b729913783c5..ac7b656caef8 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -47,10 +47,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java
index 5b914ce2ac90..161ea2a8daaf 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -146,10 +146,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -171,10 +171,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
index abe0d8c3df8e..4f148162f6a1 100644
--- a/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
+++ b/samples/client/petstore/java/webclient-nullable-arrays/src/main/java/org/openapitools/client/model/ByteArrayObject.java
@@ -64,10 +64,10 @@ public ByteArrayObject nullableArray(byte[] nullableArray) {
     return this;
   }
 
-   /**
+  /**
    * byte array.
    * @return nullableArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -97,10 +97,10 @@ public ByteArrayObject normalArray(byte[] normalArray) {
     return this;
   }
 
-   /**
+  /**
    * byte array.
    * @return normalArray
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NORMAL_ARRAY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -122,10 +122,10 @@ public ByteArrayObject nullableString(String nullableString) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableString
    * @return nullableString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -155,10 +155,10 @@ public ByteArrayObject stringField(String stringField) {
     return this;
   }
 
-   /**
+  /**
    * Get stringField
    * @return stringField
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING_FIELD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -180,10 +180,10 @@ public ByteArrayObject intField(BigDecimal intField) {
     return this;
   }
 
-   /**
+  /**
    * Get intField
    * @return intField
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT_FIELD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 32f03d9c09c9..da51cc95c56f 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -58,10 +58,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
@@ -92,10 +92,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index e15dc6ad7b18..aa80060c54a2 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -49,10 +49,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -75,10 +75,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
index 3bad3c618a0a..a70117335ef2 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Animal.java
@@ -61,10 +61,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
@@ -87,10 +87,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_COLOR)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 9f37004ec514..23028039f656 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -56,10 +56,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 419fa3066604..d8c39622e274 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -56,10 +56,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java
index d12eb990568f..9ca8cbbd661c 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -64,10 +64,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
@@ -98,10 +98,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
@@ -132,10 +132,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java
index 8fbd9d931c1a..2428707db31c 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -64,10 +64,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
@@ -90,10 +90,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
@@ -116,10 +116,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
@@ -142,10 +142,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
@@ -168,10 +168,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
@@ -194,10 +194,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Name of the pet ")
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java
index 444621803318..30794e2c918b 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Cat.java
@@ -55,10 +55,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DECLAWED)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Category.java
index 831e91bbbb86..c8a06fd85ea5 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Category.java
@@ -48,10 +48,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -74,10 +74,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index b3441736036c..a2d982c9588f 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -56,10 +56,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java
index b87806282ace..9abf96a275c3 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -45,10 +45,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Client.java
index 5126531fbec6..09a6592e00d6 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Client.java
@@ -44,10 +44,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CLIENT)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index 459092648615..b903514c5b6a 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -46,10 +46,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java
index 24ec14842556..03653774c8b0 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Dog.java
@@ -55,10 +55,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BREED)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 459af5d873f2..ee1cec6dd4ba 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -121,10 +121,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
@@ -155,10 +155,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
index 89d9db5fb8a1..9765a6febaab 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -225,10 +225,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
@@ -251,10 +251,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
@@ -277,10 +277,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
@@ -303,10 +303,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
@@ -329,10 +329,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -363,10 +363,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
@@ -389,10 +389,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
@@ -415,10 +415,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index fa28a5c0daa7..a76b256dba0e 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -52,10 +52,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SOME_ID)
@@ -86,10 +86,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 34ce1e41dbec..2e4f3ec9eace 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -52,10 +52,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FILE)
@@ -86,10 +86,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FILES)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java
index 531a0ab96f79..0719e8276dc6 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Foo.java
@@ -44,10 +44,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAR)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 0c136fabcc59..7c1ba71646eb 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -46,10 +46,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_STRING)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
index fc796dc450a3..682729a36a5c 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -110,12 +110,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INTEGER)
@@ -138,12 +138,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -166,10 +166,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INT64)
@@ -192,12 +192,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NUMBER)
@@ -220,12 +220,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FLOAT)
@@ -248,12 +248,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DOUBLE)
@@ -276,10 +276,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DECIMAL)
@@ -302,10 +302,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_STRING)
@@ -328,10 +328,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BYTE)
@@ -354,10 +354,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BINARY)
@@ -380,10 +380,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DATE)
@@ -406,10 +406,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
@@ -432,10 +432,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -458,10 +458,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -484,10 +484,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "A string that is a 10 digit number. Can have leading zeros.")
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
@@ -510,10 +510,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.")
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 96f26bba5d02..5daacb4ac02d 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -43,8 +43,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -55,10 +55,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -70,10 +70,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FOO)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 243a9f68d803..24a536912ffa 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -49,10 +49,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java
index 7877824626cc..d527e3b549b0 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -101,10 +101,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
@@ -135,10 +135,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
@@ -169,10 +169,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
@@ -203,10 +203,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9dca5c15e4d9..a83bbff3d3fe 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -57,10 +57,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -83,10 +83,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
@@ -117,10 +117,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MAP)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java
index b8ef3d7c8bdc..10f4ae94d353 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -50,10 +50,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -76,10 +76,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 947c468003bd..5fc09f4f4ac6 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -53,10 +53,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -79,10 +79,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -105,10 +105,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java
index ee71aea80127..feab1035f1ce 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -46,10 +46,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Test capitalization")
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java
index 58be446b951b..98c5d0f1a531 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelList.java
@@ -45,10 +45,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_123LIST)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 7dacf2a4aa87..5a9c9f7daf1c 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,10 +46,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_RETURN)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Name.java
index 77a776d7fa42..27ddd5d0f74f 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Name.java
@@ -51,8 +51,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -69,10 +69,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -89,10 +89,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
@@ -110,10 +110,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PROPERTY)
@@ -130,10 +130,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_123NUMBER)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java
index c4b9dc55be2e..5aa780cf94b0 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NullableClass.java
@@ -101,10 +101,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -135,10 +135,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -169,10 +169,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -203,10 +203,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -237,10 +237,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -271,10 +271,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -317,10 +317,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -363,10 +363,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -405,10 +405,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
@@ -443,10 +443,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -489,10 +489,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
@@ -531,10 +531,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 482215299869..fcb21e3f236f 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -45,10 +45,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 9fc29338b5fc..c477751afe93 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -61,10 +61,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -87,11 +87,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -115,11 +115,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -151,11 +151,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
index a95c7979764a..95d9c6203225 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -102,10 +102,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -128,10 +128,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -154,10 +154,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -180,10 +180,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
@@ -206,10 +206,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order Status")
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -232,10 +232,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 4d2232f4b9b6..3641bf62e8d5 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -53,10 +53,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
@@ -79,10 +79,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MY_STRING)
@@ -105,10 +105,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index 474c46f62cbd..017a99220cfa 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -45,10 +45,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_VALUE)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 331ecad27bd3..df20cb05b019 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -97,10 +97,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -123,10 +123,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonIgnore
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java
index 03e9a03973ed..53af9145552d 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,10 +109,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -135,10 +135,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CATEGORY)
@@ -161,10 +161,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -195,10 +195,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
@@ -230,10 +230,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TAGS)
@@ -256,10 +256,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "pet status in the store")
   @JsonProperty(JSON_PROPERTY_STATUS)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index aedf2b41f841..d1f24bf0f1f0 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -42,8 +42,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -52,10 +52,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAR)
@@ -73,10 +73,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_BAZ)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f4f433957ef1..70ee015d4b7b 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -45,10 +45,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java
index 6e72f67b6535..b7a0ab82c5e2 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/Tag.java
@@ -48,10 +48,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -74,10 +74,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index 751f79f3ea7e..29bcc5eeeb77 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -48,10 +48,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/User.java
index 353eb84cb767..0ee75d56d22c 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/User.java
@@ -72,10 +72,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -98,10 +98,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -124,10 +124,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -150,10 +150,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -176,10 +176,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -202,10 +202,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -228,10 +228,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -254,10 +254,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "User Status")
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml
index 96dc260deb8d..1eddf878948c 100644
--- a/samples/client/petstore/java/webclient/api/openapi.yaml
+++ b/samples/client/petstore/java/webclient/api/openapi.yaml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
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 3fe65d7ddb6b..ea2a905ed84f 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
@@ -57,10 +57,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
index 3a557c2aca7d..52f5f3da6424 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AllOfWithSingleRef.java
@@ -48,10 +48,10 @@ public AllOfWithSingleRef username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public AllOfWithSingleRef singleRefType(SingleRefType singleRefType) {
     return this;
   }
 
-   /**
+  /**
    * Get singleRefType
    * @return singleRefType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SINGLE_REF_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
index 9c7596b2cfb0..fb8060948c5f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
@@ -60,10 +60,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -85,10 +85,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 6cfdc93a9e1a..05d6a8b157e0 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
@@ -55,10 +55,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 f1810daace0b..f1d21467ace2 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
@@ -55,10 +55,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 bb2ec31e9ec2..851f20f7023f 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
@@ -63,10 +63,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -129,10 +129,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
index 3a82316cd11f..c5d6b86b6c69 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -63,10 +63,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -88,10 +88,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -113,10 +113,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,10 +138,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,10 +188,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
index 797d453b5457..36e096184ddf 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
@@ -54,10 +54,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
index e9daed894ab8..7c9d93682b1e 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
@@ -47,10 +47,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
index 07632d8f36dd..54c8da1f850f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ChildWithNullable.java
@@ -55,10 +55,10 @@ public ChildWithNullable otherProperty(String otherProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get otherProperty
    * @return otherProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OTHER_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
index faeaf6d170f7..f855164463ba 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,10 +43,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
index 4addbe634b17..50cca186dccf 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
@@ -43,10 +43,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index e4f4e82aa533..9c42cffb7601 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -45,10 +45,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
index 78b64eaa57db..21bdbf6ac3ac 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
@@ -54,10 +54,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 92532236e656..877dcb0a8ba7 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
@@ -120,10 +120,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
index 0e4e6a0540ad..1c109d2dd9d2 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -224,10 +224,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -249,10 +249,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -274,10 +274,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -299,10 +299,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -324,10 +324,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -357,10 +357,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -382,10 +382,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -407,10 +407,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
index b2d93dd9598b..36e8bdb5161b 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FakeBigDecimalMap200Response.java
@@ -51,10 +51,10 @@ public FakeBigDecimalMap200Response someId(BigDecimal someId) {
     return this;
   }
 
-   /**
+  /**
    * Get someId
    * @return someId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FakeBigDecimalMap200Response putSomeMapItem(String key, BigDecimal someMa
     return this;
   }
 
-   /**
+  /**
    * Get someMap
    * @return someMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 49a1a55c803c..c16372e986fd 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
@@ -51,10 +51,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -84,10 +84,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java
index 19172be87d0c..15d16a3010e7 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Foo.java
@@ -43,10 +43,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 24fe1cafa473..a36cf7426541 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -45,10 +45,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
index 350ecc2b3d38..fa8df5cbe365 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -109,12 +109,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -136,12 +136,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -163,10 +163,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -188,12 +188,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -215,12 +215,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -242,12 +242,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -269,10 +269,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -294,10 +294,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -319,10 +319,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -344,10 +344,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -369,10 +369,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -394,10 +394,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -419,10 +419,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -444,10 +444,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -469,10 +469,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -494,10 +494,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4e3d9aa3c7ec..2f46a0e85d02 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -42,8 +42,8 @@ public class HasOnlyReadOnly {
   public HasOnlyReadOnly() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public HasOnlyReadOnly(
     @JsonProperty(JSON_PROPERTY_BAR) String bar, 
@@ -54,10 +54,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -68,10 +68,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index d556badbc86b..e7e4e4ca5c6d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -47,10 +47,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
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 03e24725e27d..51b10990fc13 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
@@ -100,10 +100,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -166,10 +166,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -199,10 +199,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 9b44f9a93d29..a16c9498ef4f 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
@@ -56,10 +56,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -81,10 +81,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -114,10 +114,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
index 999b5e34446b..2a18245f5f79 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -48,10 +48,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -73,10 +73,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 19b3b2e5b411..1f13412355b8 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -52,10 +52,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java
index 065dbc19bb0b..822fea6c2327 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -44,10 +44,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java
index 432cbfd18ee1..a8fb60cdfc2c 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelList.java
@@ -44,10 +44,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
index 491491e42994..669b30691c79 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -44,10 +44,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
index 1168630509be..3b165e7570c7 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
@@ -49,8 +49,8 @@ public class Name {
   public Name() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public Name(
     @JsonProperty(JSON_PROPERTY_SNAKE_CASE) Integer snakeCase, 
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -86,10 +86,10 @@ public void setName(Integer name) {
     this.name = name;
   }
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -106,10 +106,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -125,10 +125,10 @@ public void setProperty(String property) {
     this.property = property;
   }
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 da34667718dc..745e8e4f629b 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
@@ -100,10 +100,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -133,10 +133,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -166,10 +166,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -199,10 +199,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -232,10 +232,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -265,10 +265,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -310,10 +310,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -355,10 +355,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -396,10 +396,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -433,10 +433,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -478,10 +478,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -519,10 +519,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
index 9b8575bb5aa3..8625f00c8741 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -44,10 +44,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 99fbb8a48c0d..7a950fdc2eb4 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
@@ -60,10 +60,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,11 +85,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -112,11 +112,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -147,11 +147,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
index 198c4705b48d..0fc8d456873f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
@@ -101,10 +101,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -126,10 +126,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -151,10 +151,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -176,10 +176,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -226,10 +226,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5bbc97e9f32c..4adb1bc59812 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -52,10 +52,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -77,10 +77,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -102,10 +102,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
index d94b304fbc88..ea419cb7df38 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterObjectWithEnumProperty.java
@@ -44,10 +44,10 @@ public OuterObjectWithEnumProperty value(OuterEnumInteger value) {
     return this;
   }
 
-   /**
+  /**
    * Get value
    * @return value
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_VALUE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
index 427b0421acd8..642875630cf2 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ParentWithNullable.java
@@ -96,10 +96,10 @@ public ParentWithNullable type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableProperty
    * @return nullableProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
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 f980aacf589c..2650f35015d4 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
@@ -108,10 +108,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -133,10 +133,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -158,10 +158,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -191,10 +191,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -225,10 +225,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -250,10 +250,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4a4070939629..fa8bdd64bc96 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,8 +41,8 @@ public class ReadOnlyFirst {
   public ReadOnlyFirst() {
   }
   /**
-  * Constructor with only readonly parameters
-  */
+   * Constructor with only readonly parameters
+   */
   @JsonCreator
   public ReadOnlyFirst(
     @JsonProperty(JSON_PROPERTY_BAR) String bar
@@ -51,10 +51,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -71,10 +71,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
index ddf6739e77ef..7d8ea856dd38 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -44,10 +44,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
index a6b72d921a6a..518116d43ce5 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -47,10 +47,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index dd167049f5bd..6b7f560ebb28 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -47,10 +47,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
index 2c0f53742f0a..2ecb4b0fbb3e 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
@@ -71,10 +71,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -121,10 +121,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -146,10 +146,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -171,10 +171,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -196,10 +196,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -221,10 +221,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -246,10 +246,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
index ba87ca7a7f0b..0de0cd5fc91c 100644
--- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
@@ -59,7 +59,7 @@ public Pet atType(String atType) {
   /**
    * Get atType
    * @return atType
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("@type")
@@ -79,7 +79,7 @@ public Pet age(Integer age) {
   /**
    * Get age
    * @return age
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("age")
@@ -99,7 +99,7 @@ public Pet happy(Boolean happy) {
   /**
    * Get happy
    * @return happy
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("happy")
@@ -119,7 +119,7 @@ public Pet price(BigDecimal price) {
   /**
    * Get price
    * @return price
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("price")
@@ -139,7 +139,7 @@ public Pet lastFeed(OffsetDateTime lastFeed) {
   /**
    * Get lastFeed
    * @return lastFeed
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("lastFeed")
@@ -159,7 +159,7 @@ public Pet dateOfBirth(LocalDate dateOfBirth) {
   /**
    * Get dateOfBirth
    * @return dateOfBirth
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateOfBirth")
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java
index a8d9854984a5..e2682c42ef99 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Order.java
@@ -85,7 +85,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -105,7 +105,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -125,7 +125,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -145,7 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -165,7 +165,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -185,7 +185,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java
index ade46cebf0cc..8c0e38dfb6a1 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -169,7 +169,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
    * Get photoUrls
    * @return photoUrls
    * @deprecated
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", deprecated = true, requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -180,7 +180,7 @@ public List<String> getPhotoUrls() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setPhotoUrls(List<String> photoUrls) {
     this.photoUrls = photoUrls;
@@ -202,7 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -222,7 +222,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java
index c15327f3b227..e69dcad7a2aa 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java
@@ -35,7 +35,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java
index 4cbbaf729fd1..beb8c406e91c 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -39,7 +39,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -59,7 +59,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -79,7 +79,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java
index bc7c066e59e5..59dbbb89f24d 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java
@@ -84,7 +84,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -104,7 +104,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -124,7 +124,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -144,7 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -164,7 +164,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -184,7 +184,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
index 1902a984b405..bfd489d624cc 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
@@ -101,7 +101,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -121,7 +121,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -141,7 +141,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -169,7 +169,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -197,7 +197,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -218,7 +218,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -229,7 +229,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java
index 5887c9efe1ee..5452ab7e1af8 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java
@@ -35,7 +35,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java
index 881ccb2a1e17..1d7b11886256 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java
@@ -47,7 +47,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -67,7 +67,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -87,7 +87,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -107,7 +107,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -127,7 +127,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -147,7 +147,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -167,7 +167,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -187,7 +187,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java
index fa4e1fe94d4e..7ce269abfd38 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Category.java
@@ -35,7 +35,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java
index 4cbbaf729fd1..beb8c406e91c 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -39,7 +39,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -59,7 +59,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -79,7 +79,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java
index bc7c066e59e5..59dbbb89f24d 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Order.java
@@ -84,7 +84,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -104,7 +104,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -124,7 +124,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -144,7 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -164,7 +164,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -184,7 +184,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java
index a494a12b31ad..ac7f5ecbe696 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -216,7 +216,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java
index 5887c9efe1ee..5452ab7e1af8 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/Tag.java
@@ -35,7 +35,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java
index 881ccb2a1e17..1d7b11886256 100644
--- a/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-tags/src/main/java/org/openapitools/model/User.java
@@ -47,7 +47,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -67,7 +67,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -87,7 +87,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -107,7 +107,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -127,7 +127,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -147,7 +147,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -167,7 +167,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -187,7 +187,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
index c15327f3b227..e69dcad7a2aa 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -35,7 +35,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
index 4cbbaf729fd1..beb8c406e91c 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -39,7 +39,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -59,7 +59,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -79,7 +79,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
index bc7c066e59e5..59dbbb89f24d 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
@@ -84,7 +84,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -104,7 +104,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -124,7 +124,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -144,7 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -164,7 +164,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -184,7 +184,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index 1902a984b405..bfd489d624cc 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -101,7 +101,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -121,7 +121,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -141,7 +141,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -169,7 +169,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -197,7 +197,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -218,7 +218,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -229,7 +229,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
index 5887c9efe1ee..5452ab7e1af8 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
@@ -35,7 +35,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
index 881ccb2a1e17..1d7b11886256 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
@@ -47,7 +47,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -67,7 +67,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -87,7 +87,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -107,7 +107,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -127,7 +127,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -147,7 +147,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -167,7 +167,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -187,7 +187,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index f6e91abd0e92..73c2a380397f 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -33,7 +33,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index e5edfa4e4bf0..e6a0a29d89da 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -34,7 +34,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 6722cc8d7c00..2efe8a9bd223 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -33,7 +33,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 9c9951ba0ee4..25206b0d5f88 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -72,7 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @JsonProperty("map_string")
   public Map<String, String> getMapString() {
@@ -99,7 +99,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   
   @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
@@ -126,7 +126,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
@@ -153,7 +153,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
@@ -180,7 +180,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   
   @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -207,7 +207,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   
   @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -234,7 +234,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   
   @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -261,7 +261,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   
   @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -280,7 +280,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @JsonProperty("anytype_1")
   public Object getAnytype1() {
@@ -299,7 +299,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
@@ -318,7 +318,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @JsonProperty("anytype_3")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 0fbd5a6ea78e..ba6556442320 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -33,7 +33,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index c5fda2ad4411..d161142745d1 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -34,7 +34,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 16c17ea274a3..2622a649f171 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -34,7 +34,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 2ffdc5858754..349f6e72c4b9 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -33,7 +33,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java
index a66168d94e11..ccb5187764b5 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java
@@ -56,7 +56,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull
   @JsonProperty("className")
   public String getClassName() {
@@ -75,7 +75,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @JsonProperty("color")
   public String getColor() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index be778c875a3b..9c284fea7f5c 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -42,7 +42,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   
   @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 18898266b2b1..5bb985f23574 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -42,7 +42,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   
   @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java
index 2e49a4df396a..729a8bd33a58 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java
@@ -48,7 +48,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
@@ -75,7 +75,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   
   @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -102,7 +102,7 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   
   @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java
index d4898994d732..9d1997acc915 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java
@@ -85,7 +85,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @JsonProperty("kind")
   public KindEnum getKind() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java
index d72933333995..69017736aefb 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java
@@ -39,7 +39,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @JsonProperty("smallCamel")
   public String getSmallCamel() {
@@ -58,7 +58,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
@@ -77,7 +77,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @JsonProperty("small_Snake")
   public String getSmallSnake() {
@@ -96,7 +96,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
@@ -115,7 +115,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
@@ -134,7 +134,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @JsonProperty("ATT_NAME")
   public String getATTNAME() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java
index 721bb0d249ec..b92170331ccd 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java
@@ -53,7 +53,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @JsonProperty("declawed")
   public Boolean getDeclawed() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java
index eb83541e4c41..bcc577a2e895 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java
@@ -42,7 +42,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -61,7 +61,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java
index 55900a6d4319..62da77b13db3 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -37,7 +37,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @JsonProperty("otherProperty")
   public String getOtherProperty() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java
index 452f6393dedc..1bc2cc56b6fc 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java
@@ -29,7 +29,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @JsonProperty("_class")
   public String getPropertyClass() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java
index 487a5a8ad131..1ea5d2ff0a0b 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java
@@ -29,7 +29,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @JsonProperty("client")
   public String getClient() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 1a2f85d0c198..4311a410fd70 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -64,7 +64,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
@@ -91,7 +91,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull
   @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
@@ -118,7 +118,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull
   @JsonProperty("required_array")
   public List<String> getRequiredArray() {
@@ -145,7 +145,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java
index 8d248fcea071..c5418daf89ac 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java
@@ -45,7 +45,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @JsonProperty("breed")
   public String getBreed() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java
index 86ffe6a757e0..0f27caa47014 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java
@@ -106,7 +106,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
@@ -133,7 +133,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java
index c95e4bd3f519..10a65d2c14c1 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java
@@ -196,7 +196,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
@@ -215,7 +215,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull
   @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -234,7 +234,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
@@ -253,7 +253,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
@@ -272,7 +272,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   
   @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java
index 4e3a977b0b2f..cdd8e28506bb 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java
@@ -29,7 +29,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @JsonProperty("sourceURI")
   public String getSourceURI() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index ae973abc934d..026dfc0f79f0 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -36,7 +36,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   
   @JsonProperty("file")
   public File getFile() {
@@ -63,7 +63,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   
   @JsonProperty("files")
   public List<File> getFiles() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java
index d8df57c42657..e035411ba631 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -81,7 +81,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   
   @JsonProperty("integer")
   public Integer getInteger() {
@@ -102,7 +102,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   
   @JsonProperty("int32")
   public Integer getInt32() {
@@ -121,7 +121,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @JsonProperty("int64")
   public Long getInt64() {
@@ -142,7 +142,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull
   @JsonProperty("number")
   public BigDecimal getNumber() {
@@ -163,7 +163,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   
   @JsonProperty("float")
   public Float getFloat() {
@@ -184,7 +184,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   
   @JsonProperty("double")
   public Double getDouble() {
@@ -203,7 +203,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   
   @JsonProperty("string")
   public String getString() {
@@ -222,7 +222,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull
   @JsonProperty("byte")
   public byte[] getByte() {
@@ -241,7 +241,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   
   @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
@@ -260,7 +260,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull
   @JsonProperty("date")
   public LocalDate getDate() {
@@ -279,7 +279,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
@@ -298,7 +298,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
@@ -317,7 +317,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull
   @JsonProperty("password")
   public String getPassword() {
@@ -336,7 +336,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index bca3e95e3711..2d18716ed3a2 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -33,7 +33,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @JsonProperty("bar")
   public String getBar() {
@@ -52,7 +52,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @JsonProperty("foo")
   public String getFoo() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java
index 7783a6a3310f..4bfa43febcac 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java
@@ -85,7 +85,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   
   @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -112,7 +112,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
@@ -139,7 +139,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
@@ -166,7 +166,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ebb74beaf971..460ff96edb2e 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -41,7 +41,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
@@ -60,7 +60,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
@@ -87,7 +87,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java
index 8936cde4034e..22ba66e6a0ce 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java
@@ -33,7 +33,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public Integer getName() {
@@ -52,7 +52,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @JsonProperty("class")
   public String getPropertyClass() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
index 2ea004e5e7d2..1c7ff4a4b710 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -35,7 +35,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @JsonProperty("code")
   public Integer getCode() {
@@ -54,7 +54,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @JsonProperty("type")
   public String getType() {
@@ -73,7 +73,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @JsonProperty("message")
   public String getMessage() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java
index 47b80e398ab0..39d3f07d441e 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java
@@ -31,7 +31,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @JsonProperty("123-list")
   public String get123list() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java
index 2895491ce69f..d96821bdf418 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java
@@ -31,7 +31,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @JsonProperty("return")
   public Integer getReturn() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java
index 75e36971e7de..0b84aa86211e 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java
@@ -46,7 +46,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull
   @JsonProperty("name")
   public Integer getName() {
@@ -65,7 +65,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @JsonProperty("snake_case")
   public Integer getSnakeCase() {
@@ -84,7 +84,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @JsonProperty("property")
   public String getProperty() {
@@ -103,7 +103,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @JsonProperty("123Number")
   public Integer get123number() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java
index 5c6b5ca36725..a2e12398f5e1 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -43,7 +43,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @JsonProperty("languageValues")
   public JsonNullable<Map<String, String>> getLanguageValues() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java
index e224a2e27e8a..27ae77e5b1bd 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java
@@ -30,7 +30,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   
   @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java
index e9cca08860f6..9b4f4ee79a63 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java
@@ -80,7 +80,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -99,7 +99,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @JsonProperty("petId")
   public Long getPetId() {
@@ -118,7 +118,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @JsonProperty("quantity")
   public Integer getQuantity() {
@@ -137,7 +137,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   
   @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
@@ -156,7 +156,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @JsonProperty("status")
   public StatusEnum getStatus() {
@@ -175,7 +175,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @JsonProperty("complete")
   public Boolean getComplete() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java
index d48534f9c88e..9d9d362bc15a 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java
@@ -34,7 +34,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   
   @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
@@ -53,7 +53,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @JsonProperty("my_string")
   public String getMyString() {
@@ -72,7 +72,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
index 7feaa4029fd7..28c56627b9d8 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -80,7 +80,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @JsonProperty("type")
   public TypeEnum getType() {
@@ -99,7 +99,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @JsonProperty("nullableProperty")
   public JsonNullable<String> getNullableProperty() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
index a785c5fd73e1..3b95f3d72e4c 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -119,7 +119,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   
   @JsonProperty("category")
   public Category getCategory() {
@@ -138,7 +138,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull
   @JsonProperty("name")
   public String getName() {
@@ -165,7 +165,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull
   @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
@@ -193,7 +193,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   
   @JsonProperty("tags")
   public List<Tag> getTags() {
@@ -213,7 +213,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @JsonProperty("status")
   @Deprecated
@@ -223,7 +223,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 8c6bb2493ae1..9ef1172376b0 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -31,7 +31,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @JsonProperty("bar")
   public String getBar() {
@@ -50,7 +50,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @JsonProperty("baz")
   public String getBaz() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 59d743927070..0aa9f97f5eb6 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -35,7 +35,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @JsonProperty("normalPropertyName")
   public String getNormalPropertyName() {
@@ -54,7 +54,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
   public String getUPPERCASEPROPERTYSNAKE() {
@@ -73,7 +73,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @JsonProperty("lower-case-property-dashes")
   public String getLowerCasePropertyDashes() {
@@ -92,7 +92,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @JsonProperty("property name with spaces")
   public String getPropertyNameWithSpaces() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
index 1ceef11c1df7..f24f54d2ebb8 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -31,7 +31,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java
index 8320afa22caa..70fc46f8c2e5 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java
@@ -31,7 +31,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -50,7 +50,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 5d0bf8b2a5cc..4a71e099215b 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -57,7 +57,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull
   @JsonProperty("string_item")
   public String getStringItem() {
@@ -76,7 +76,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull
   @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
@@ -95,7 +95,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull
   @JsonProperty("integer_item")
   public Integer getIntegerItem() {
@@ -114,7 +114,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull
   @JsonProperty("bool_item")
   public Boolean getBoolItem() {
@@ -141,7 +141,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull
   @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
index be653ef45586..c7c0db41ee49 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -60,7 +60,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull
   @JsonProperty("string_item")
   public String getStringItem() {
@@ -79,7 +79,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull
   @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
@@ -98,7 +98,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull
   @JsonProperty("float_item")
   public Float getFloatItem() {
@@ -117,7 +117,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull
   @JsonProperty("integer_item")
   public Integer getIntegerItem() {
@@ -136,7 +136,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull
   @JsonProperty("bool_item")
   public Boolean getBoolItem() {
@@ -163,7 +163,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull
   @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java
index 6c58a0abdaca..15b12dd15932 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java
@@ -43,7 +43,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -62,7 +62,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @JsonProperty("username")
   public String getUsername() {
@@ -81,7 +81,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @JsonProperty("firstName")
   public String getFirstName() {
@@ -100,7 +100,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @JsonProperty("lastName")
   public String getLastName() {
@@ -119,7 +119,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @JsonProperty("email")
   public String getEmail() {
@@ -138,7 +138,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @JsonProperty("password")
   public String getPassword() {
@@ -157,7 +157,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @JsonProperty("phone")
   public String getPhone() {
@@ -176,7 +176,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java
index c459a044c4da..b004f00712c9 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java
@@ -98,7 +98,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @JsonProperty("attribute_string")
   public String getAttributeString() {
@@ -117,7 +117,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   
   @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
@@ -136,7 +136,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
@@ -155,7 +155,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
@@ -182,7 +182,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
@@ -201,7 +201,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @JsonProperty("name_string")
   public String getNameString() {
@@ -220,7 +220,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   
   @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
@@ -239,7 +239,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @JsonProperty("name_integer")
   public Integer getNameInteger() {
@@ -258,7 +258,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
@@ -285,7 +285,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @JsonProperty("name_array")
   public List<Integer> getNameArray() {
@@ -312,7 +312,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
@@ -331,7 +331,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @JsonProperty("prefix_string")
   public String getPrefixString() {
@@ -350,7 +350,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   
   @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
@@ -369,7 +369,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
@@ -388,7 +388,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
@@ -415,7 +415,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
@@ -442,7 +442,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
@@ -461,7 +461,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @JsonProperty("namespace_string")
   public String getNamespaceString() {
@@ -480,7 +480,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   
   @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
@@ -499,7 +499,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
@@ -518,7 +518,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
@@ -545,7 +545,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
@@ -572,7 +572,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
@@ -591,7 +591,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
@@ -610,7 +610,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   
   @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
@@ -629,7 +629,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
@@ -648,7 +648,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
@@ -675,7 +675,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
@@ -702,7 +702,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
index 58fdfd2a0e89..cf82f34d2119 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesAnyTypeDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
index 4033d9df200d..6b12c9eabc31 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesArrayDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
index efe2023b8e85..0696a817ae15 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesBooleanDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
index 148e4f3c0a33..63fa26b02349 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
@@ -74,7 +74,7 @@ public AdditionalPropertiesClassDto putMapStringItem(String key, String mapStrin
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @JsonProperty("map_string")
   public Map<String, String> getMapString() {
@@ -101,7 +101,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   
   @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
@@ -128,7 +128,7 @@ public AdditionalPropertiesClassDto putMapIntegerItem(String key, Integer mapInt
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
@@ -155,7 +155,7 @@ public AdditionalPropertiesClassDto putMapBooleanItem(String key, Boolean mapBoo
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
@@ -182,7 +182,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List<Inte
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   
   @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -209,7 +209,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List<Obje
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   
   @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -236,7 +236,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map<String,
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   
   @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -263,7 +263,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map<String,
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   
   @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -282,7 +282,7 @@ public AdditionalPropertiesClassDto anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @JsonProperty("anytype_1")
   public Object getAnytype1() {
@@ -301,7 +301,7 @@ public AdditionalPropertiesClassDto anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
@@ -320,7 +320,7 @@ public AdditionalPropertiesClassDto anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @JsonProperty("anytype_3")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
index 8142aa5a91e5..419df3b4cd5b 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesIntegerDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
index 625b281fafe2..0b370385e991 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesNumberDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
index 22eae615ed9c..c4186077cb7c 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesObjectDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
index 8b3cfd2995fd..e58218446c83 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesStringDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java
index e1d2763ef86a..a644fc36b71b 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java
@@ -50,7 +50,7 @@ public AnimalDto className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull
   @JsonProperty("className")
   public String getClassName() {
@@ -69,7 +69,7 @@ public AnimalDto color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @JsonProperty("color")
   public String getColor() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java
index ba0b28921810..9f98d22aec5f 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java
@@ -35,7 +35,7 @@ public ApiResponseDto code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @JsonProperty("code")
   public Integer getCode() {
@@ -54,7 +54,7 @@ public ApiResponseDto type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @JsonProperty("type")
   public String getType() {
@@ -73,7 +73,7 @@ public ApiResponseDto message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @JsonProperty("message")
   public String getMessage() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
index c92a1d03d32f..cfe1625fe950 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
@@ -44,7 +44,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List<BigDecimal> arra
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   
   @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
index ab5fbbacf758..9f6a8bfb6e46 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
@@ -44,7 +44,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   
   @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java
index 6020ac35b1f2..93a9c5aadef0 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java
@@ -50,7 +50,7 @@ public ArrayTestDto addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
@@ -77,7 +77,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerIte
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   
   @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -104,7 +104,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<ReadOnlyFirstDto> arrayArrayOf
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   
   @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirstDto>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java
index 8257c6850138..45f9933a58d1 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java
@@ -80,7 +80,7 @@ public BigCatDto kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @JsonProperty("kind")
   public KindEnum getKind() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java
index b811a5435b6c..8d74f6bb3694 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java
@@ -41,7 +41,7 @@ public CapitalizationDto smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @JsonProperty("smallCamel")
   public String getSmallCamel() {
@@ -60,7 +60,7 @@ public CapitalizationDto capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
@@ -79,7 +79,7 @@ public CapitalizationDto smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @JsonProperty("small_Snake")
   public String getSmallSnake() {
@@ -98,7 +98,7 @@ public CapitalizationDto capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
@@ -117,7 +117,7 @@ public CapitalizationDto scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
@@ -136,7 +136,7 @@ public CapitalizationDto ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @JsonProperty("ATT_NAME")
   public String getATTNAME() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java
index 70489d21234c..4dd1cbf5e163 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java
@@ -47,7 +47,7 @@ public CatDto declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @JsonProperty("declawed")
   public Boolean getDeclawed() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java
index bb58b2f84c9a..f4ad7ff8f698 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java
@@ -37,7 +37,7 @@ public CategoryDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -56,7 +56,7 @@ public CategoryDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java
index df4d1f0fd225..db3ccc04e506 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java
@@ -39,7 +39,7 @@ public ChildWithNullableDto otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @JsonProperty("otherProperty")
   public String getOtherProperty() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java
index 47bcb6861a78..1aebac2f69c8 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java
@@ -31,7 +31,7 @@ public ClassModelDto propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @JsonProperty("_class")
   public String getPropertyClass() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java
index 33c4597403e0..edb95749cbdb 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java
@@ -31,7 +31,7 @@ public ClientDto client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @JsonProperty("client")
   public String getClient() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
index 073823f3ed38..5f892c0cdc17 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
@@ -58,7 +58,7 @@ public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
@@ -85,7 +85,7 @@ public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequ
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull
   @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
@@ -112,7 +112,7 @@ public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull
   @JsonProperty("required_array")
   public List<String> getRequiredArray() {
@@ -139,7 +139,7 @@ public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableA
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java
index e9213ee1263d..d72cd8031bf2 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java
@@ -40,7 +40,7 @@ public DogDto breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @JsonProperty("breed")
   public String getBreed() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java
index a25560ca274b..c3fb96ea6a54 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java
@@ -108,7 +108,7 @@ public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
@@ -135,7 +135,7 @@ public EnumArraysDto addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java
index 7b6eda3c2c86..c04a58dd0aad 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java
@@ -189,7 +189,7 @@ public EnumTestDto enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
@@ -208,7 +208,7 @@ public EnumTestDto enumStringRequired(EnumStringRequiredEnum enumStringRequired)
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull
   @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -227,7 +227,7 @@ public EnumTestDto enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
@@ -246,7 +246,7 @@ public EnumTestDto enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
@@ -265,7 +265,7 @@ public EnumTestDto outerEnum(OuterEnumDto outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   
   @JsonProperty("outerEnum")
   public OuterEnumDto getOuterEnum() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java
index b3a168e82657..a3a12f8099a8 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java
@@ -31,7 +31,7 @@ public FileDto sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @JsonProperty("sourceURI")
   public String getSourceURI() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
index 3770bb1c23d3..69ecbf5c1875 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
@@ -38,7 +38,7 @@ public FileSchemaTestClassDto file(FileDto file) {
   /**
    * Get file
    * @return file
-  */
+   */
   
   @JsonProperty("file")
   public FileDto getFile() {
@@ -65,7 +65,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   
   @JsonProperty("files")
   public List<FileDto> getFiles() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java
index 9bcc871a0f9e..0a23445ba0fa 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java
@@ -71,7 +71,7 @@ public FormatTestDto integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   
   @JsonProperty("integer")
   public Integer getInteger() {
@@ -92,7 +92,7 @@ public FormatTestDto int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   
   @JsonProperty("int32")
   public Integer getInt32() {
@@ -111,7 +111,7 @@ public FormatTestDto int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @JsonProperty("int64")
   public Long getInt64() {
@@ -132,7 +132,7 @@ public FormatTestDto number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull
   @JsonProperty("number")
   public BigDecimal getNumber() {
@@ -153,7 +153,7 @@ public FormatTestDto _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   
   @JsonProperty("float")
   public Float getFloat() {
@@ -174,7 +174,7 @@ public FormatTestDto _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   
   @JsonProperty("double")
   public Double getDouble() {
@@ -193,7 +193,7 @@ public FormatTestDto string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   
   @JsonProperty("string")
   public String getString() {
@@ -212,7 +212,7 @@ public FormatTestDto _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull
   @JsonProperty("byte")
   public byte[] getByte() {
@@ -231,7 +231,7 @@ public FormatTestDto binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   
   @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
@@ -250,7 +250,7 @@ public FormatTestDto date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull
   @JsonProperty("date")
   public LocalDate getDate() {
@@ -269,7 +269,7 @@ public FormatTestDto dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
@@ -288,7 +288,7 @@ public FormatTestDto uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
@@ -307,7 +307,7 @@ public FormatTestDto password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull
   @JsonProperty("password")
   public String getPassword() {
@@ -326,7 +326,7 @@ public FormatTestDto bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
index c4caa29989d3..d0268c321015 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
@@ -33,7 +33,7 @@ public HasOnlyReadOnlyDto bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @JsonProperty("bar")
   public String getBar() {
@@ -52,7 +52,7 @@ public HasOnlyReadOnlyDto foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @JsonProperty("foo")
   public String getFoo() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java
index 8d3d84b35cf7..ec96bb57e640 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java
@@ -31,7 +31,7 @@ public ListDto _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @JsonProperty("123-list")
   public String get123list() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java
index 854ddc3ceb80..9d3bfa8311be 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java
@@ -87,7 +87,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map<String, String> mapMapOf
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   
   @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -114,7 +114,7 @@ public MapTestDto putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringIt
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
@@ -141,7 +141,7 @@ public MapTestDto putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
@@ -168,7 +168,7 @@ public MapTestDto putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
index 3506e72ce8b7..b677b15a7d19 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
@@ -43,7 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
@@ -62,7 +62,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime da
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
@@ -89,7 +89,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani
   /**
    * Get map
    * @return map
-  */
+   */
   
   @JsonProperty("map")
   public Map<String, AnimalDto> getMap() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java
index 41054e5c23ac..cff54304402d 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java
@@ -33,7 +33,7 @@ public Model200ResponseDto name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public Integer getName() {
@@ -52,7 +52,7 @@ public Model200ResponseDto propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @JsonProperty("class")
   public String getPropertyClass() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java
index 7d9c312ee260..db16daa48fdf 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java
@@ -41,7 +41,7 @@ public NameDto name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull
   @JsonProperty("name")
   public Integer getName() {
@@ -60,7 +60,7 @@ public NameDto snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @JsonProperty("snake_case")
   public Integer getSnakeCase() {
@@ -79,7 +79,7 @@ public NameDto property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @JsonProperty("property")
   public String getProperty() {
@@ -98,7 +98,7 @@ public NameDto _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @JsonProperty("123Number")
   public Integer get123number() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java
index 720f5b9ac91b..ede7ad3d5de9 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java
@@ -45,7 +45,7 @@ public NullableMapPropertyDto putLanguageValuesItem(String key, String languageV
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @JsonProperty("languageValues")
   public JsonNullable<Map<String, String>> getLanguageValues() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java
index 67f2e715a7d9..be5a2c9cb452 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java
@@ -32,7 +32,7 @@ public NumberOnlyDto justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   
   @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java
index 39277a7752dd..4c99ebca0eee 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java
@@ -82,7 +82,7 @@ public OrderDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -101,7 +101,7 @@ public OrderDto petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @JsonProperty("petId")
   public Long getPetId() {
@@ -120,7 +120,7 @@ public OrderDto quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @JsonProperty("quantity")
   public Integer getQuantity() {
@@ -139,7 +139,7 @@ public OrderDto shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   
   @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
@@ -158,7 +158,7 @@ public OrderDto status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @JsonProperty("status")
   public StatusEnum getStatus() {
@@ -177,7 +177,7 @@ public OrderDto complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @JsonProperty("complete")
   public Boolean getComplete() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java
index f5fe71673e87..6994923d488d 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java
@@ -36,7 +36,7 @@ public OuterCompositeDto myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   
   @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
@@ -55,7 +55,7 @@ public OuterCompositeDto myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @JsonProperty("my_string")
   public String getMyString() {
@@ -74,7 +74,7 @@ public OuterCompositeDto myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java
index 32be19830132..4de4ded94751 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java
@@ -81,7 +81,7 @@ public ParentWithNullableDto type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @JsonProperty("type")
   public TypeEnum getType() {
@@ -100,7 +100,7 @@ public ParentWithNullableDto nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @JsonProperty("nullableProperty")
   public JsonNullable<String> getNullableProperty() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
index e42286f40d96..daf4efa69b2b 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
@@ -94,7 +94,7 @@ public PetDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -113,7 +113,7 @@ public PetDto category(CategoryDto category) {
   /**
    * Get category
    * @return category
-  */
+   */
   
   @JsonProperty("category")
   public CategoryDto getCategory() {
@@ -132,7 +132,7 @@ public PetDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull
   @JsonProperty("name")
   public String getName() {
@@ -159,7 +159,7 @@ public PetDto addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull
   @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
@@ -187,7 +187,7 @@ public PetDto addTagsItem(TagDto tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   
   @JsonProperty("tags")
   public List<TagDto> getTags() {
@@ -207,7 +207,7 @@ public PetDto status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @JsonProperty("status")
   @Deprecated
@@ -217,7 +217,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
index 59f059b8f28c..4d6ff923c229 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
@@ -33,7 +33,7 @@ public ReadOnlyFirstDto bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @JsonProperty("bar")
   public String getBar() {
@@ -52,7 +52,7 @@ public ReadOnlyFirstDto baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @JsonProperty("baz")
   public String getBaz() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
index 8bb44cbfee66..3eeeacdb2a46 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
@@ -37,7 +37,7 @@ public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normal
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @JsonProperty("normalPropertyName")
   public String getNormalPropertyName() {
@@ -56,7 +56,7 @@ public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
   public String getUPPERCASEPROPERTYSNAKE() {
@@ -75,7 +75,7 @@ public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String l
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @JsonProperty("lower-case-property-dashes")
   public String getLowerCasePropertyDashes() {
@@ -94,7 +94,7 @@ public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String pr
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @JsonProperty("property name with spaces")
   public String getPropertyNameWithSpaces() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java
index 6d157a128dd6..364a7d8d79c6 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java
@@ -31,7 +31,7 @@ public ReturnDto _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @JsonProperty("return")
   public Integer getReturn() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java
index 82b01fe3ba00..c0285932ef1f 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java
@@ -31,7 +31,7 @@ public class SpecialModelNameDto {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java
index 0bbd6c17c49a..d71fb89aea3a 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java
@@ -33,7 +33,7 @@ public TagDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -52,7 +52,7 @@ public TagDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
index fe7f39508300..454e7638b7a0 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
@@ -48,7 +48,7 @@ public TypeHolderDefaultDto stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull
   @JsonProperty("string_item")
   public String getStringItem() {
@@ -67,7 +67,7 @@ public TypeHolderDefaultDto numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull
   @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
@@ -86,7 +86,7 @@ public TypeHolderDefaultDto integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull
   @JsonProperty("integer_item")
   public Integer getIntegerItem() {
@@ -105,7 +105,7 @@ public TypeHolderDefaultDto boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull
   @JsonProperty("bool_item")
   public Boolean getBoolItem() {
@@ -132,7 +132,7 @@ public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull
   @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
index 58d6993c0ce4..60eef4d19ef2 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
@@ -50,7 +50,7 @@ public TypeHolderExampleDto stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull
   @JsonProperty("string_item")
   public String getStringItem() {
@@ -69,7 +69,7 @@ public TypeHolderExampleDto numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull
   @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
@@ -88,7 +88,7 @@ public TypeHolderExampleDto floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull
   @JsonProperty("float_item")
   public Float getFloatItem() {
@@ -107,7 +107,7 @@ public TypeHolderExampleDto integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull
   @JsonProperty("integer_item")
   public Integer getIntegerItem() {
@@ -126,7 +126,7 @@ public TypeHolderExampleDto boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull
   @JsonProperty("bool_item")
   public Boolean getBoolItem() {
@@ -153,7 +153,7 @@ public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull
   @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java
index 234b83a74ff8..426ee7e57b2a 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java
@@ -45,7 +45,7 @@ public UserDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -64,7 +64,7 @@ public UserDto username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @JsonProperty("username")
   public String getUsername() {
@@ -83,7 +83,7 @@ public UserDto firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @JsonProperty("firstName")
   public String getFirstName() {
@@ -102,7 +102,7 @@ public UserDto lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @JsonProperty("lastName")
   public String getLastName() {
@@ -121,7 +121,7 @@ public UserDto email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @JsonProperty("email")
   public String getEmail() {
@@ -140,7 +140,7 @@ public UserDto password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @JsonProperty("password")
   public String getPassword() {
@@ -159,7 +159,7 @@ public UserDto phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @JsonProperty("phone")
   public String getPhone() {
@@ -178,7 +178,7 @@ public UserDto userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java
index ecbde7751f50..31f99e803311 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java
@@ -100,7 +100,7 @@ public XmlItemDto attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @JsonProperty("attribute_string")
   public String getAttributeString() {
@@ -119,7 +119,7 @@ public XmlItemDto attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   
   @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
@@ -138,7 +138,7 @@ public XmlItemDto attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
@@ -157,7 +157,7 @@ public XmlItemDto attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
@@ -184,7 +184,7 @@ public XmlItemDto addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
@@ -203,7 +203,7 @@ public XmlItemDto nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @JsonProperty("name_string")
   public String getNameString() {
@@ -222,7 +222,7 @@ public XmlItemDto nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   
   @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
@@ -241,7 +241,7 @@ public XmlItemDto nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @JsonProperty("name_integer")
   public Integer getNameInteger() {
@@ -260,7 +260,7 @@ public XmlItemDto nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
@@ -287,7 +287,7 @@ public XmlItemDto addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @JsonProperty("name_array")
   public List<Integer> getNameArray() {
@@ -314,7 +314,7 @@ public XmlItemDto addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
@@ -333,7 +333,7 @@ public XmlItemDto prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @JsonProperty("prefix_string")
   public String getPrefixString() {
@@ -352,7 +352,7 @@ public XmlItemDto prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   
   @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
@@ -371,7 +371,7 @@ public XmlItemDto prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
@@ -390,7 +390,7 @@ public XmlItemDto prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
@@ -417,7 +417,7 @@ public XmlItemDto addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
@@ -444,7 +444,7 @@ public XmlItemDto addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
@@ -463,7 +463,7 @@ public XmlItemDto namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @JsonProperty("namespace_string")
   public String getNamespaceString() {
@@ -482,7 +482,7 @@ public XmlItemDto namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   
   @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
@@ -501,7 +501,7 @@ public XmlItemDto namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
@@ -520,7 +520,7 @@ public XmlItemDto namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
@@ -547,7 +547,7 @@ public XmlItemDto addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
@@ -574,7 +574,7 @@ public XmlItemDto addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
@@ -593,7 +593,7 @@ public XmlItemDto prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
@@ -612,7 +612,7 @@ public XmlItemDto prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   
   @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
@@ -631,7 +631,7 @@ public XmlItemDto prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
@@ -650,7 +650,7 @@ public XmlItemDto prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
@@ -677,7 +677,7 @@ public XmlItemDto addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
@@ -704,7 +704,7 @@ public XmlItemDto addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem)
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java
index 26661eb9da8c..a5c09b762386 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/ChildSchema.java
@@ -59,10 +59,10 @@ public ChildSchema prop1(String prop1) {
     return this;
   }
 
-   /**
+  /**
    * Get prop1
    * @return prop1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROP1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java
index 6b5332a8f29e..ca967241c75c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/MySchemaNameCharacters.java
@@ -60,10 +60,10 @@ public MySchemaNameCharacters prop2(String prop2) {
     return this;
   }
 
-   /**
+  /**
    * Get prop2
    * @return prop2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROP2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java
index 6861ac1475ee..9aafeca4eadb 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/model/Parent.java
@@ -58,10 +58,10 @@ public Parent objectType(String objectType) {
     return this;
   }
 
-   /**
+  /**
    * Get objectType
    * @return objectType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Category.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Category.java
index 20f454f8b2fb..e7506808d6d0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Category.java
@@ -52,10 +52,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -78,10 +78,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8da96d2821ef..e138999eb0c0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -57,10 +57,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -83,10 +83,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -109,10 +109,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Order.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Order.java
index 3d3836239bad..b597e7486b3b 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Order.java
@@ -106,10 +106,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -132,10 +132,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -158,10 +158,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -184,10 +184,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
@@ -210,10 +210,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -236,10 +236,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_COMPLETE)
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 a56c003231ec..2bbaa7e4745f 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
@@ -110,10 +110,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -136,10 +136,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_CATEGORY)
@@ -162,10 +162,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -196,10 +196,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @ApiModelProperty(required = true, value = "")
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
@@ -230,10 +230,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_TAGS)
@@ -257,11 +257,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Tag.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Tag.java
index 3645982636fe..b0eb9019c709 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/Tag.java
@@ -52,10 +52,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -78,10 +78,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/User.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/User.java
index 2f20b61ae6ec..09bcfa8dffdd 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/src/main/java/org/openapitools/client/model/User.java
@@ -76,10 +76,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -102,10 +102,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -128,10 +128,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -154,10 +154,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -180,10 +180,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -206,10 +206,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -232,10 +232,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -258,10 +258,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Category.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Category.java
index 96c69a85e747..ae3a3e6a1dd4 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Category.java
@@ -51,10 +51,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -77,10 +77,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index f6c7383e4467..31413bb7f5b6 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -56,10 +56,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CODE)
@@ -82,10 +82,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TYPE)
@@ -108,10 +108,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Order.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Order.java
index a9e4bb9ff7b9..a27382ab46b1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Order.java
@@ -105,10 +105,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -131,10 +131,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -157,10 +157,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -183,10 +183,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
@@ -209,10 +209,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "Order Status")
   @JsonProperty(JSON_PROPERTY_STATUS)
@@ -235,10 +235,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Pet.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Pet.java
index df78caa4292c..05abd30bbe51 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Pet.java
@@ -109,10 +109,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -135,10 +135,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_CATEGORY)
@@ -161,10 +161,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
@@ -195,10 +195,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
@@ -229,10 +229,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_TAGS)
@@ -256,11 +256,11 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "pet status in the store")
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Tag.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Tag.java
index 12d40c2238c8..3820f9959b22 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/Tag.java
@@ -51,10 +51,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -77,10 +77,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/User.java b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/User.java
index 768490f1d38a..e24c8367d9e8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/src/main/java/org/openapitools/client/model/User.java
@@ -75,10 +75,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_ID)
@@ -101,10 +101,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -127,10 +127,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -153,10 +153,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -179,10 +179,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -205,10 +205,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -231,10 +231,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
   @JsonProperty(JSON_PROPERTY_PHONE)
@@ -257,10 +257,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "User Status")
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
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 a32df497efb7..573d9846d3cc 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
@@ -87,10 +87,10 @@ public AdditionalPropertiesClass putMapPropertyItem(String key, String mapProper
     return this;
   }
 
-   /**
+  /**
    * Get mapProperty
    * @return mapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -120,10 +120,10 @@ public AdditionalPropertiesClass putMapOfMapPropertyItem(String key, Map<String,
     return this;
   }
 
-   /**
+  /**
    * Get mapOfMapProperty
    * @return mapOfMapProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_MAP_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -145,10 +145,10 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
     return this;
   }
 
-   /**
+  /**
    * Get anytype1
    * @return anytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -178,10 +178,10 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype1(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype1
    * @return mapWithUndeclaredPropertiesAnytype1
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE1)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -203,10 +203,10 @@ public AdditionalPropertiesClass mapWithUndeclaredPropertiesAnytype2(Object mapW
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype2
    * @return mapWithUndeclaredPropertiesAnytype2
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE2)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -236,10 +236,10 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesAnytype3Item(Stri
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesAnytype3
    * @return mapWithUndeclaredPropertiesAnytype3
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_ANYTYPE3)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
@@ -261,10 +261,10 @@ public AdditionalPropertiesClass emptyMap(Object emptyMap) {
     return this;
   }
 
-   /**
+  /**
    * an object with no declared properties and no undeclared properties, hence it&#39;s an empty map.
    * @return emptyMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMPTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -294,10 +294,10 @@ public AdditionalPropertiesClass putMapWithUndeclaredPropertiesStringItem(String
     return this;
   }
 
-   /**
+  /**
    * Get mapWithUndeclaredPropertiesString
    * @return mapWithUndeclaredPropertiesString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_WITH_UNDECLARED_PROPERTIES_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
index 0e75fe989f68..ed68a1e2193f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
@@ -62,10 +62,10 @@ public Animal className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -87,10 +87,10 @@ public Animal color(String color) {
     return this;
   }
 
-   /**
+  /**
    * Get color
    * @return color
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COLOR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
index cb08c48fcd9b..b3177ecf976f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Apple.java
@@ -50,10 +50,10 @@ public Apple cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CULTIVAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Apple origin(String origin) {
     return this;
   }
 
-   /**
+  /**
    * Get origin
    * @return origin
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ORIGIN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
index d17ec8ac02af..0f6c09038a74 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AppleReq.java
@@ -50,10 +50,10 @@ public AppleReq cultivar(String cultivar) {
     return this;
   }
 
-   /**
+  /**
    * Get cultivar
    * @return cultivar
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CULTIVAR)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -75,10 +75,10 @@ public AppleReq mealy(Boolean mealy) {
     return this;
   }
 
-   /**
+  /**
    * Get mealy
    * @return mealy
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MEALY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 2f990b472a7b..bcfcdeef4003 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
@@ -56,10 +56,10 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 44f6b97d97c2..4f1942c3bfcd 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
@@ -56,10 +56,10 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNumber
    * @return arrayNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 1457023ecb7e..9c4ea9e26044 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
@@ -64,10 +64,10 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayOfString
    * @return arrayOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -97,10 +97,10 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -130,10 +130,10 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
     return this;
   }
 
-   /**
+  /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ARRAY_OF_MODEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
index d1e5353f1ec8..d68e7d07e821 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Banana.java
@@ -47,10 +47,10 @@ public Banana lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LENGTH_CM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
index 234c3475735a..c554f894f93a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BananaReq.java
@@ -51,10 +51,10 @@ public BananaReq lengthCm(BigDecimal lengthCm) {
     return this;
   }
 
-   /**
+  /**
    * Get lengthCm
    * @return lengthCm
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_LENGTH_CM)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -76,10 +76,10 @@ public BananaReq sweet(Boolean sweet) {
     return this;
   }
 
-   /**
+  /**
    * Get sweet
    * @return sweet
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SWEET)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
index 415c42d5fdd0..cae2208b9b10 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/BasquePig.java
@@ -45,10 +45,10 @@ public BasquePig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
index 2e76806e9b60..9a86f6bc43b8 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -65,10 +65,10 @@ public Capitalization smallCamel(String smallCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get smallCamel
    * @return smallCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,10 +90,10 @@ public Capitalization capitalCamel(String capitalCamel) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalCamel
    * @return capitalCamel
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_CAMEL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -115,10 +115,10 @@ public Capitalization smallSnake(String smallSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get smallSnake
    * @return smallSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SMALL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -140,10 +140,10 @@ public Capitalization capitalSnake(String capitalSnake) {
     return this;
   }
 
-   /**
+  /**
    * Get capitalSnake
    * @return capitalSnake
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CAPITAL_SNAKE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -165,10 +165,10 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
     return this;
   }
 
-   /**
+  /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SC_A_E_T_H_FLOW_POINTS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -190,10 +190,10 @@ public Capitalization ATT_NAME(String ATT_NAME) {
     return this;
   }
 
-   /**
+  /**
    * Name of the pet 
    * @return ATT_NAME
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_A_T_T_N_A_M_E)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
index 8c2a45bda579..4e724794ffa2 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
@@ -60,10 +60,10 @@ public Cat declawed(Boolean declawed) {
     return this;
   }
 
-   /**
+  /**
    * Get declawed
    * @return declawed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECLAWED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
index f220788eb81c..30894b69fe24 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
@@ -49,10 +49,10 @@ public Category id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Category name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
index 29f41ac83088..9e2ee57637db 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ChildCat.java
@@ -65,10 +65,10 @@ public ChildCat name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -98,10 +98,10 @@ public ChildCat petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
index 9825ca47924c..6b82725db526 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -45,10 +45,10 @@ public ClassModel propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
index f6f8b1c99210..c1c756e68ee2 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
@@ -45,10 +45,10 @@ public Client client(String client) {
     return this;
   }
 
-   /**
+  /**
    * Get client
    * @return client
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CLIENT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
index 988d200c0c19..9c8e37cbe93f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ComplexQuadrilateral.java
@@ -53,10 +53,10 @@ public ComplexQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -78,10 +78,10 @@ public ComplexQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
index bb5a04c768a1..b13a1face321 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DanishPig.java
@@ -45,10 +45,10 @@ public DanishPig className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DeprecatedObject.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DeprecatedObject.java
index d84252f8f552..b76d1571f97c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DeprecatedObject.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DeprecatedObject.java
@@ -47,10 +47,10 @@ public DeprecatedObject name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
index 20faf7d8029d..1b1763d1edd2 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
@@ -59,10 +59,10 @@ public Dog breed(String breed) {
     return this;
   }
 
-   /**
+  /**
    * Get breed
    * @return breed
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BREED)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 9a44da56d675..431f46762b3f 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
@@ -71,10 +71,10 @@ public Drawing mainShape(Shape mainShape) {
     return this;
   }
 
-   /**
+  /**
    * Get mainShape
    * @return mainShape
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAIN_SHAPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -96,10 +96,10 @@ public Drawing shapeOrNull(ShapeOrNull shapeOrNull) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeOrNull
    * @return shapeOrNull
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -129,10 +129,10 @@ public Drawing nullableShape(NullableShape nullableShape) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableShape
    * @return nullableShape
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -170,10 +170,10 @@ public Drawing addShapesItem(Shape shapesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get shapes
    * @return shapes
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHAPES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 699fca30a939..95ac4e0ca6a0 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
@@ -121,10 +121,10 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
     return this;
   }
 
-   /**
+  /**
    * Get justSymbol
    * @return justSymbol
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_SYMBOL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -154,10 +154,10 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayEnum
    * @return arrayEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ENUM)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index f9627a7e8ae7..5eeda8575a9f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -265,10 +265,10 @@ public EnumTest enumString(EnumStringEnum enumString) {
     return this;
   }
 
-   /**
+  /**
    * Get enumString
    * @return enumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -290,10 +290,10 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
     return this;
   }
 
-   /**
+  /**
    * Get enumStringRequired
    * @return enumStringRequired
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_ENUM_STRING_REQUIRED)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -315,10 +315,10 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get enumInteger
    * @return enumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -340,10 +340,10 @@ public EnumTest enumIntegerOnly(EnumIntegerOnlyEnum enumIntegerOnly) {
     return this;
   }
 
-   /**
+  /**
    * Get enumIntegerOnly
    * @return enumIntegerOnly
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_INTEGER_ONLY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -365,10 +365,10 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get enumNumber
    * @return enumNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ENUM_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -390,10 +390,10 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnum
    * @return outerEnum
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -423,10 +423,10 @@ public EnumTest outerEnumInteger(OuterEnumInteger outerEnumInteger) {
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumInteger
    * @return outerEnumInteger
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -448,10 +448,10 @@ public EnumTest outerEnumDefaultValue(OuterEnumDefaultValue outerEnumDefaultValu
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumDefaultValue
    * @return outerEnumDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -473,10 +473,10 @@ public EnumTest outerEnumIntegerDefaultValue(OuterEnumIntegerDefaultValue outerE
     return this;
   }
 
-   /**
+  /**
    * Get outerEnumIntegerDefaultValue
    * @return outerEnumIntegerDefaultValue
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OUTER_ENUM_INTEGER_DEFAULT_VALUE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
index 0e7ee3ade3d9..5d610ba50e05 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EquilateralTriangle.java
@@ -53,10 +53,10 @@ public EquilateralTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -78,10 +78,10 @@ public EquilateralTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
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 762d3046fe4d..d981b37718fc 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
@@ -52,10 +52,10 @@ public FileSchemaTestClass _file(ModelFile _file) {
     return this;
   }
 
-   /**
+  /**
    * Get _file
    * @return _file
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -85,10 +85,10 @@ public FileSchemaTestClass addFilesItem(ModelFile filesItem) {
     return this;
   }
 
-   /**
+  /**
    * Get files
    * @return files
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FILES)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
index ff94368149f8..4d7136578721 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Foo.java
@@ -45,10 +45,10 @@ public Foo bar(String bar) {
     return this;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 012abb5c0d4c..70bf7dc5fd5c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -47,10 +47,10 @@ public FooGetDefaultResponse string(Foo string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index 6d3886f7b7ac..b2d615fb9638 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -111,12 +111,12 @@ public FormatTest integer(Integer integer) {
     return this;
   }
 
-   /**
+  /**
    * Get integer
    * minimum: 10
    * maximum: 100
    * @return integer
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -138,12 +138,12 @@ public FormatTest int32(Integer int32) {
     return this;
   }
 
-   /**
+  /**
    * Get int32
    * minimum: 20
    * maximum: 200
    * @return int32
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT32)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -165,10 +165,10 @@ public FormatTest int64(Long int64) {
     return this;
   }
 
-   /**
+  /**
    * Get int64
    * @return int64
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INT64)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -190,12 +190,12 @@ public FormatTest number(BigDecimal number) {
     return this;
   }
 
-   /**
+  /**
    * Get number
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -217,12 +217,12 @@ public FormatTest _float(Float _float) {
     return this;
   }
 
-   /**
+  /**
    * Get _float
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FLOAT)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -244,12 +244,12 @@ public FormatTest _double(Double _double) {
     return this;
   }
 
-   /**
+  /**
    * Get _double
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DOUBLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -271,10 +271,10 @@ public FormatTest decimal(BigDecimal decimal) {
     return this;
   }
 
-   /**
+  /**
    * Get decimal
    * @return decimal
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -296,10 +296,10 @@ public FormatTest string(String string) {
     return this;
   }
 
-   /**
+  /**
    * Get string
    * @return string
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -321,10 +321,10 @@ public FormatTest _byte(byte[] _byte) {
     return this;
   }
 
-   /**
+  /**
    * Get _byte
    * @return _byte
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_BYTE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -346,10 +346,10 @@ public FormatTest binary(File binary) {
     return this;
   }
 
-   /**
+  /**
    * Get binary
    * @return binary
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BINARY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -371,10 +371,10 @@ public FormatTest date(LocalDate date) {
     return this;
   }
 
-   /**
+  /**
    * Get date
    * @return date
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -396,10 +396,10 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -421,10 +421,10 @@ public FormatTest uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -446,10 +446,10 @@ public FormatTest password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -471,10 +471,10 @@ public FormatTest patternWithDigits(String patternWithDigits) {
     return this;
   }
 
-   /**
+  /**
    * A string that is a 10 digit number. Can have leading zeros.
    * @return patternWithDigits
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -496,10 +496,10 @@ public FormatTest patternWithDigitsAndDelimiter(String patternWithDigitsAndDelim
     return this;
   }
 
-   /**
+  /**
    * A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
    * @return patternWithDigitsAndDelimiter
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
index 88bed4ccafdf..d0c85efe54d7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/GrandparentAnimal.java
@@ -58,10 +58,10 @@ public GrandparentAnimal petType(String petType) {
     return this;
   }
 
-   /**
+  /**
    * Get petType
    * @return petType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PET_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index f3e3d132d24b..9a95c807a30a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -55,10 +55,10 @@ public HasOnlyReadOnly(
     this.foo = foo;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -70,10 +70,10 @@ public String getBar() {
 
 
 
-   /**
+  /**
    * Get foo
    * @return foo
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FOO)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
index 0c93ed4c2e55..a2ed6b773db0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HealthCheckResult.java
@@ -49,10 +49,10 @@ public HealthCheckResult nullableMessage(String nullableMessage) {
     return this;
   }
 
-   /**
+  /**
    * Get nullableMessage
    * @return nullableMessage
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
index 613584397cf8..d33c042a59f0 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/IsoscelesTriangle.java
@@ -49,10 +49,10 @@ public IsoscelesTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -74,10 +74,10 @@ public IsoscelesTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
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 f70f39af2146..28b19756a114 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
@@ -102,10 +102,10 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
     return this;
   }
 
-   /**
+  /**
    * Get mapMapOfString
    * @return mapMapOfString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_MAP_OF_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -135,10 +135,10 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
     return this;
   }
 
-   /**
+  /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP_OF_ENUM_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -168,10 +168,10 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get directMap
    * @return directMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -201,10 +201,10 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
     return this;
   }
 
-   /**
+  /**
    * Get indirectMap
    * @return indirectMap
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INDIRECT_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 5d2d79ab40fc..1bff4fc10813 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
@@ -58,10 +58,10 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -83,10 +83,10 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
     return this;
   }
 
-   /**
+  /**
    * Get dateTime
    * @return dateTime
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
     return this;
   }
 
-   /**
+  /**
    * Get map
    * @return map
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
index eed2db748630..8b238021b97c 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -50,10 +50,10 @@ public Model200Response name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public Model200Response propertyClass(String propertyClass) {
     return this;
   }
 
-   /**
+  /**
    * Get propertyClass
    * @return propertyClass
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY_CLASS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index c273720b1d92..5ebd6eb35302 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -54,10 +54,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
-   /**
+  /**
    * Get code
    * @return code
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public ModelApiResponse message(String message) {
     return this;
   }
 
-   /**
+  /**
    * Get message
    * @return message
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java
index 5a7b12470ca7..d209835cae1b 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelFile.java
@@ -46,10 +46,10 @@ public ModelFile sourceURI(String sourceURI) {
     return this;
   }
 
-   /**
+  /**
    * Test capitalization
    * @return sourceURI
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOURCE_U_R_I)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java
index 0d311354af59..f6bdbc022ae1 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelList.java
@@ -46,10 +46,10 @@ public ModelList _123list(String _123list) {
     return this;
   }
 
-   /**
+  /**
    * Get _123list
    * @return _123list
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123LIST)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
index b5eed8583372..3a91e2253aeb 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,10 +46,10 @@ public ModelReturn _return(Integer _return) {
     return this;
   }
 
-   /**
+  /**
    * Get _return
    * @return _return
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_RETURN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
index db16949f0b1b..14576f0c4692 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
@@ -67,10 +67,10 @@ public Name name(Integer name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -87,10 +87,10 @@ public void setName(Integer name) {
   }
 
 
-   /**
+  /**
    * Get snakeCase
    * @return snakeCase
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SNAKE_CASE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -107,10 +107,10 @@ public Name property(String property) {
     return this;
   }
 
-   /**
+  /**
    * Get property
    * @return property
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -127,10 +127,10 @@ public void setProperty(String property) {
   }
 
 
-   /**
+  /**
    * Get _123number
    * @return _123number
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_123NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 a7081a251ca5..a571fd2e905c 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
@@ -104,10 +104,10 @@ public NullableClass integerProp(Integer integerProp) {
     return this;
   }
 
-   /**
+  /**
    * Get integerProp
    * @return integerProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -137,10 +137,10 @@ public NullableClass numberProp(BigDecimal numberProp) {
     return this;
   }
 
-   /**
+  /**
    * Get numberProp
    * @return numberProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -170,10 +170,10 @@ public NullableClass booleanProp(Boolean booleanProp) {
     return this;
   }
 
-   /**
+  /**
    * Get booleanProp
    * @return booleanProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -203,10 +203,10 @@ public NullableClass stringProp(String stringProp) {
     return this;
   }
 
-   /**
+  /**
    * Get stringProp
    * @return stringProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -236,10 +236,10 @@ public NullableClass dateProp(LocalDate dateProp) {
     return this;
   }
 
-   /**
+  /**
    * Get dateProp
    * @return dateProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -269,10 +269,10 @@ public NullableClass datetimeProp(OffsetDateTime datetimeProp) {
     return this;
   }
 
-   /**
+  /**
    * Get datetimeProp
    * @return datetimeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -314,10 +314,10 @@ public NullableClass addArrayNullablePropItem(Object arrayNullablePropItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayNullableProp
    * @return arrayNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -359,10 +359,10 @@ public NullableClass addArrayAndItemsNullablePropItem(Object arrayAndItemsNullab
     return this;
   }
 
-   /**
+  /**
    * Get arrayAndItemsNullableProp
    * @return arrayAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -400,10 +400,10 @@ public NullableClass addArrayItemsNullableItem(Object arrayItemsNullableItem) {
     return this;
   }
 
-   /**
+  /**
    * Get arrayItemsNullable
    * @return arrayItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ARRAY_ITEMS_NULLABLE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -437,10 +437,10 @@ public NullableClass putObjectNullablePropItem(String key, Object objectNullable
     return this;
   }
 
-   /**
+  /**
    * Get objectNullableProp
    * @return objectNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -482,10 +482,10 @@ public NullableClass putObjectAndItemsNullablePropItem(String key, Object object
     return this;
   }
 
-   /**
+  /**
    * Get objectAndItemsNullableProp
    * @return objectAndItemsNullableProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -523,10 +523,10 @@ public NullableClass putObjectItemsNullableItem(String key, Object objectItemsNu
     return this;
   }
 
-   /**
+  /**
    * Get objectItemsNullable
    * @return objectItemsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_ITEMS_NULLABLE)
   @JsonInclude(content = JsonInclude.Include.ALWAYS, value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
index c80c28b00620..ae0e2ca26364 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -46,10 +46,10 @@ public NumberOnly justNumber(BigDecimal justNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get justNumber
    * @return justNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_JUST_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 79ff4ed2b3f2..a1156d77ea68 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
@@ -64,10 +64,10 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
     return this;
   }
 
-   /**
+  /**
    * Get uuid
    * @return uuid
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -90,11 +90,11 @@ public ObjectWithDeprecatedFields id(BigDecimal id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
@@ -119,11 +119,11 @@ public ObjectWithDeprecatedFields deprecatedRef(DeprecatedObject deprecatedRef)
     return this;
   }
 
-   /**
+  /**
    * Get deprecatedRef
    * @return deprecatedRef
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DEPRECATED_REF)
@@ -156,11 +156,11 @@ public ObjectWithDeprecatedFields addBarsItem(String barsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get bars
    * @return bars
    * @deprecated
-  **/
+   */
   @Deprecated
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BARS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
index 0b6b9a4a7104..42b02900b975 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
@@ -103,10 +103,10 @@ public Order id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -128,10 +128,10 @@ public Order petId(Long petId) {
     return this;
   }
 
-   /**
+  /**
    * Get petId
    * @return petId
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -153,10 +153,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
-   /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -178,10 +178,10 @@ public Order shipDate(OffsetDateTime shipDate) {
     return this;
   }
 
-   /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -203,10 +203,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * Order Status
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -228,10 +228,10 @@ public Order complete(Boolean complete) {
     return this;
   }
 
-   /**
+  /**
    * Get complete
    * @return complete
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
index 0b11b06bba0e..d61a23f11039 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -54,10 +54,10 @@ public OuterComposite myNumber(BigDecimal myNumber) {
     return this;
   }
 
-   /**
+  /**
    * Get myNumber
    * @return myNumber
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_NUMBER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public OuterComposite myString(String myString) {
     return this;
   }
 
-   /**
+  /**
    * Get myString
    * @return myString
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public OuterComposite myBoolean(Boolean myBoolean) {
     return this;
   }
 
-   /**
+  /**
    * Get myBoolean
    * @return myBoolean
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MY_BOOLEAN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
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 0b542ebac387..29edda0c277d 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
@@ -106,10 +106,10 @@ public Pet id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -131,10 +131,10 @@ public Pet category(Category category) {
     return this;
   }
 
-   /**
+  /**
    * Get category
    * @return category
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -156,10 +156,10 @@ public Pet name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -189,10 +189,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -222,10 +222,10 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
-   /**
+  /**
    * Get tags
    * @return tags
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -247,10 +247,10 @@ public Pet status(StatusEnum status) {
     return this;
   }
 
-   /**
+  /**
    * pet status in the store
    * @return status
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
index e3a091d6c580..355c90b0f03a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
@@ -45,10 +45,10 @@ public QuadrilateralInterface quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index f243a996f361..6847dfb28bc3 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -52,10 +52,10 @@ public ReadOnlyFirst(
     this.bar = bar;
   }
 
-   /**
+  /**
    * Get bar
    * @return bar
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAR)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -72,10 +72,10 @@ public ReadOnlyFirst baz(String baz) {
     return this;
   }
 
-   /**
+  /**
    * Get baz
    * @return baz
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BAZ)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
index 34f1d2a06e36..72fdf27f6588 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -53,10 +53,10 @@ public ScaleneTriangle shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -78,10 +78,10 @@ public ScaleneTriangle triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
index bf5047a22f9d..f16071eacdd9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ShapeInterface.java
@@ -45,10 +45,10 @@ public ShapeInterface shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
index ef7d26e7cb2e..8f90f7c419ec 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SimpleQuadrilateral.java
@@ -53,10 +53,10 @@ public SimpleQuadrilateral shapeType(String shapeType) {
     return this;
   }
 
-   /**
+  /**
    * Get shapeType
    * @return shapeType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_SHAPE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
@@ -78,10 +78,10 @@ public SimpleQuadrilateral quadrilateralType(String quadrilateralType) {
     return this;
   }
 
-   /**
+  /**
    * Get quadrilateralType
    * @return quadrilateralType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_QUADRILATERAL_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f76740fe3d86..91b7b8d23ab7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -50,10 +50,10 @@ public SpecialModelName() {
     return this;
   }
 
-   /**
+  /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_$_SPECIAL_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -75,10 +75,10 @@ public SpecialModelName specialModelName(String specialModelName) {
     return this;
   }
 
-   /**
+  /**
    * Get specialModelName
    * @return specialModelName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SPECIAL_MODEL_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
index 1bc7538c92a2..b05bef74e9d4 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
@@ -49,10 +49,10 @@ public Tag id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -74,10 +74,10 @@ public Tag name(String name) {
     return this;
   }
 
-   /**
+  /**
    * Get name
    * @return name
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
index c7853dbe3b10..5b06dcdb6fc6 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TestInlineFreeformAdditionalPropertiesRequest.java
@@ -50,10 +50,10 @@ public TestInlineFreeformAdditionalPropertiesRequest someProperty(String somePro
     return this;
   }
 
-   /**
+  /**
    * Get someProperty
    * @return someProperty
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_SOME_PROPERTY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
index c355ca884231..29ffc8a75c2e 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TriangleInterface.java
@@ -45,10 +45,10 @@ public TriangleInterface triangleType(String triangleType) {
     return this;
   }
 
-   /**
+  /**
    * Get triangleType
    * @return triangleType
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_TRIANGLE_TYPE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
index 10072182af91..0c4d75049c68 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
@@ -93,10 +93,10 @@ public User id(Long id) {
     return this;
   }
 
-   /**
+  /**
    * Get id
    * @return id
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -118,10 +118,10 @@ public User username(String username) {
     return this;
   }
 
-   /**
+  /**
    * Get username
    * @return username
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -143,10 +143,10 @@ public User firstName(String firstName) {
     return this;
   }
 
-   /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -168,10 +168,10 @@ public User lastName(String lastName) {
     return this;
   }
 
-   /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -193,10 +193,10 @@ public User email(String email) {
     return this;
   }
 
-   /**
+  /**
    * Get email
    * @return email
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -218,10 +218,10 @@ public User password(String password) {
     return this;
   }
 
-   /**
+  /**
    * Get password
    * @return password
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -243,10 +243,10 @@ public User phone(String phone) {
     return this;
   }
 
-   /**
+  /**
    * Get phone
    * @return phone
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -268,10 +268,10 @@ public User userStatus(Integer userStatus) {
     return this;
   }
 
-   /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -293,10 +293,10 @@ public User objectWithNoDeclaredProps(Object objectWithNoDeclaredProps) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for objects Value must be a map of strings to values. It cannot be the &#39;null&#39; value.
    * @return objectWithNoDeclaredProps
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_OBJECT_WITH_NO_DECLARED_PROPS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -318,10 +318,10 @@ public User objectWithNoDeclaredPropsNullable(Object objectWithNoDeclaredPropsNu
     return this;
   }
 
-   /**
+  /**
    * test code generation for nullable objects. Value must be a map of strings to values or the &#39;null&#39; value.
    * @return objectWithNoDeclaredPropsNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -351,10 +351,10 @@ public User anyTypeProp(Object anyTypeProp) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. See https://github.com/OAI/OpenAPI-Specification/issues/1389
    * @return anyTypeProp
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
@@ -384,10 +384,10 @@ public User anyTypePropNullable(Object anyTypePropNullable) {
     return this;
   }
 
-   /**
+  /**
    * test code generation for any type Here the &#39;type&#39; attribute is not specified, which means the value can be anything, including the null value, string, number, boolean, array or object. The &#39;nullable&#39; attribute does not change the allowed values.
    * @return anyTypePropNullable
-  **/
+   */
   @javax.annotation.Nullable
   @JsonIgnore
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
index b74e660aad14..e5e36025b1c7 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Whale.java
@@ -54,10 +54,10 @@ public Whale hasBaleen(Boolean hasBaleen) {
     return this;
   }
 
-   /**
+  /**
    * Get hasBaleen
    * @return hasBaleen
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_HAS_BALEEN)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -79,10 +79,10 @@ public Whale hasTeeth(Boolean hasTeeth) {
     return this;
   }
 
-   /**
+  /**
    * Get hasTeeth
    * @return hasTeeth
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_HAS_TEETH)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -104,10 +104,10 @@ public Whale className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
index e7452bdb4537..6359d1252bca 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Zebra.java
@@ -91,10 +91,10 @@ public Zebra type(TypeEnum type) {
     return this;
   }
 
-   /**
+  /**
    * Get type
    * @return type
-  **/
+   */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -116,10 +116,10 @@ public Zebra className(String className) {
     return this;
   }
 
-   /**
+  /**
    * Get className
    * @return className
-  **/
+   */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_CLASS_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java
index c4651598a794..3e94da1ff6cf 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java
@@ -32,7 +32,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Optional<Long> getId() {
@@ -51,7 +51,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public Optional<@Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") String> getName() {
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java
index b1d7be2a631a..5ce95665860a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -36,7 +36,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @JsonProperty("code")
   public Optional<Integer> getCode() {
@@ -55,7 +55,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @JsonProperty("type")
   public Optional<String> getType() {
@@ -74,7 +74,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @JsonProperty("message")
   public Optional<String> getMessage() {
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java
index db395ff5eb93..9b81a84a7659 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java
@@ -81,7 +81,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Optional<Long> getId() {
@@ -100,7 +100,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @JsonProperty("petId")
   public Optional<Long> getPetId() {
@@ -119,7 +119,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @JsonProperty("quantity")
   public Optional<Integer> getQuantity() {
@@ -138,7 +138,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @JsonProperty("shipDate")
   public Optional<OffsetDateTime> getShipDate() {
@@ -157,7 +157,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @JsonProperty("status")
   public Optional<StatusEnum> getStatus() {
@@ -176,7 +176,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @JsonProperty("complete")
   public Optional<Boolean> getComplete() {
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java
index 2c96888f903e..7f9a91f1be08 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java
@@ -98,7 +98,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Optional<Long> getId() {
@@ -117,7 +117,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @JsonProperty("category")
   public Optional<Category> getCategory() {
@@ -136,7 +136,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @JsonProperty("name")
   public String getName() {
@@ -163,7 +163,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
@@ -190,7 +190,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
@@ -210,7 +210,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @JsonProperty("status")
   @Deprecated
@@ -220,7 +220,7 @@ public Optional<StatusEnum> getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(Optional<StatusEnum> status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java
index 61b68a04b91c..2bf243abd9c4 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java
@@ -32,7 +32,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Optional<Long> getId() {
@@ -51,7 +51,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public Optional<String> getName() {
diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java
index 6e9852df9082..7a3c115d30fd 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java
@@ -44,7 +44,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Optional<Long> getId() {
@@ -63,7 +63,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @JsonProperty("username")
   public Optional<String> getUsername() {
@@ -82,7 +82,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @JsonProperty("firstName")
   public Optional<String> getFirstName() {
@@ -101,7 +101,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @JsonProperty("lastName")
   public Optional<String> getLastName() {
@@ -120,7 +120,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @JsonProperty("email")
   public Optional<String> getEmail() {
@@ -139,7 +139,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @JsonProperty("password")
   public Optional<String> getPassword() {
@@ -158,7 +158,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @JsonProperty("phone")
   public Optional<String> getPhone() {
@@ -177,7 +177,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @JsonProperty("userStatus")
   public Optional<Integer> getUserStatus() {
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java
index 370637242d46..b673ea450547 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java
index 53f7e3680b60..b4d66a20084e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java
index 33e19eb56f4e..e5fa009e2906 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
index 4b1baaa3d45d..8fa5b0091dcf 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java
index 45663a64cd60..5d5c47dae061 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java
index c2f0afa0daf2..9ba29e03b9a2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
index 41b44e207bcc..8d901a7a9090 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
index 3b189e40e656..3c1deb5719d2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
index 65b4dd3f2e50..7f767a771f9c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
@@ -58,7 +58,7 @@ public Pet atType(String atType) {
   /**
    * Get atType
    * @return atType
-  */
+   */
   @NotNull 
   @Schema(name = "@type", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("@type")
@@ -78,7 +78,7 @@ public Pet age(Integer age) {
   /**
    * Get age
    * @return age
-  */
+   */
   
   @Schema(name = "age", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("age")
@@ -98,7 +98,7 @@ public Pet happy(Boolean happy) {
   /**
    * Get happy
    * @return happy
-  */
+   */
   
   @Schema(name = "happy", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("happy")
@@ -118,7 +118,7 @@ public Pet price(BigDecimal price) {
   /**
    * Get price
    * @return price
-  */
+   */
   @Valid 
   @Schema(name = "price", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("price")
@@ -138,7 +138,7 @@ public Pet lastFeed(OffsetDateTime lastFeed) {
   /**
    * Get lastFeed
    * @return lastFeed
-  */
+   */
   @Valid 
   @Schema(name = "lastFeed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastFeed")
@@ -158,7 +158,7 @@ public Pet dateOfBirth(LocalDate dateOfBirth) {
   /**
    * Get dateOfBirth
    * @return dateOfBirth
-  */
+   */
   @Valid 
   @Schema(name = "dateOfBirth", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateOfBirth")
diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java
index 3b189e40e656..3c1deb5719d2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-http-basic/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index ccf633751956..70ed8b093357 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 6881dd234e17..7a124362197e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 295ce50f7d58..be06c451b7b8 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index caec6d926511..c73cda71e006 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -74,7 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_string")
@@ -102,7 +102,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_number")
@@ -130,7 +130,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_integer")
@@ -158,7 +158,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_boolean")
@@ -186,7 +186,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_integer")
@@ -214,7 +214,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_anytype")
@@ -242,7 +242,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_string")
@@ -270,7 +270,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_anytype")
@@ -290,7 +290,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_1")
@@ -310,7 +310,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_2")
@@ -330,7 +330,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_3")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 02be3686067d..3b43d0da3584 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5be86fba0911..97d02674ec68 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index a47f4357de62..4fdc0b050153 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index ae794e96ff2c..9b045ffebb07 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
index e761fa919381..eb39e5da3aa4 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
@@ -51,7 +51,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("className")
@@ -71,7 +71,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("color")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 0278df289037..a3e3f1b10250 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a2ed8c168b39..7a8a52168934 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayNumber")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
index fb1a17cd7877..b556efec6550 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
@@ -50,7 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_of_string")
@@ -78,7 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_integer")
@@ -106,7 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_model")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java
index cabb5a3d68c2..005de19003c7 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java
@@ -80,7 +80,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("kind")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
index e9804c9a1e6e..7408b8cb7aa5 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
@@ -41,7 +41,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("smallCamel")
@@ -61,7 +61,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("CapitalCamel")
@@ -81,7 +81,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("small_Snake")
@@ -101,7 +101,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("Capital_Snake")
@@ -121,7 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -141,7 +141,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ATT_NAME")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java
index ab5fd547bbe1..86c7183a4b8e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java
@@ -48,7 +48,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("declawed")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
index 7c98792b6eda..dbcb67bd8bb4 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
@@ -37,7 +37,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -57,7 +57,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java
index de66f6c719b6..46a462be8e3c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -39,7 +39,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @Schema(name = "otherProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("otherProperty")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
index 9e27d3d33a4d..6126b788dede 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
@@ -32,7 +32,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("_class")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
index afd91d6c5fbd..21723cd0378f 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
@@ -31,7 +31,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("client")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index a6171b29d011..fcd4190208e9 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -58,7 +58,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array")
@@ -86,7 +86,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("nullable_required_array")
@@ -114,7 +114,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("required_array")
@@ -142,7 +142,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java
index ac1f127cb72c..eff7ddb3e895 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java
@@ -40,7 +40,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("breed")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
index afdb86d0c6af..efa05bc32eab 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
@@ -108,7 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("just_symbol")
@@ -136,7 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_enum")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
index cb3a32cd0d60..d6ed1bfd7681 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
@@ -191,7 +191,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_string")
@@ -211,7 +211,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("enum_string_required")
@@ -231,7 +231,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_integer")
@@ -251,7 +251,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_number")
@@ -271,7 +271,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("outerEnum")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
index b3a80b466d72..ec96357bbb76 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
@@ -32,7 +32,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("sourceURI")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index c19c90547eab..0fafd2083e8b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -38,7 +38,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("file")
@@ -66,7 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("files")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
index 60f96dd91169..06a8ba7ceb34 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
@@ -73,7 +73,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
@@ -95,7 +95,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int32")
@@ -115,7 +115,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int64")
@@ -137,7 +137,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number")
@@ -159,7 +159,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("float")
@@ -181,7 +181,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("double")
@@ -201,7 +201,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
@@ -221,7 +221,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("byte")
@@ -241,7 +241,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("binary")
@@ -261,7 +261,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
@@ -281,7 +281,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -301,7 +301,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -321,7 +321,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("password")
@@ -341,7 +341,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index e504791906c5..e2088c2e7782 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -35,7 +35,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -55,7 +55,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foo")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
index 36ae89dbc171..65991c277fb3 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
@@ -87,7 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_of_string")
@@ -115,7 +115,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_of_enum_string")
@@ -143,7 +143,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("direct_map")
@@ -171,7 +171,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("indirect_map")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 020d04b7411e..a371a767e67d 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -43,7 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -63,7 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -91,7 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
index 9ffa25ca597d..2a46d99bad50 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
@@ -36,7 +36,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
@@ -56,7 +56,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("class")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
index cbdfaeca7dc3..8e2e78236c71 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -37,7 +37,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -57,7 +57,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -77,7 +77,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
index 5bec1e4192a8..f77cc933f6d6 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
@@ -33,7 +33,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123-list")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
index 92c63607830b..613a20b8a24a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
@@ -34,7 +34,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("return")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
index ff9d36c6292c..82598b95c2d6 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
@@ -42,7 +42,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -62,7 +62,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("snake_case")
@@ -82,7 +82,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property")
@@ -102,7 +102,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123Number")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java
index 0cb8288e4022..d31209ccafc4 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -45,7 +45,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @Schema(name = "languageValues", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("languageValues")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
index 46b1d19305d9..d6ad5164f1c0 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
@@ -32,7 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("JustNumber")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
index 4c2cf39daf1f..9e452a29b1df 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
@@ -82,7 +82,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -102,7 +102,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -122,7 +122,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -142,7 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -162,7 +162,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -182,7 +182,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
index 5ddc334ca0e0..9fc1f16c5b49 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
@@ -36,7 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_number")
@@ -56,7 +56,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_string")
@@ -76,7 +76,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_boolean")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1749253b10ed..26366e74fb4d 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -82,7 +82,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -102,7 +102,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @Schema(name = "nullableProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullableProperty")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
index e26e3e121f56..b89fdac1060b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
@@ -94,7 +94,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -114,7 +114,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -134,7 +134,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -162,7 +162,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -191,7 +191,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -212,7 +212,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -223,7 +223,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 83608394b3ac..d881cbb0a8b3 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -33,7 +33,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -53,7 +53,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("baz")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 5f604c887303..9f6c5494cc9a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -37,7 +37,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("normalPropertyName")
@@ -57,7 +57,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -77,7 +77,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lower-case-property-dashes")
@@ -97,7 +97,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property name with spaces")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
index 03b736e43ffc..9397b3b4a00e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -33,7 +33,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("$special[property.name]")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
index e51dc6e80b9b..50945536995a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
@@ -33,7 +33,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 565afa2c58b4..72492a546371 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -48,7 +48,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -68,7 +68,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -88,7 +88,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -108,7 +108,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -136,7 +136,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
index adb27841c55c..a04959a2990b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -50,7 +50,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -70,7 +70,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -90,7 +90,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("float_item")
@@ -110,7 +110,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -130,7 +130,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -158,7 +158,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
index cf2938851e83..fa92088bda97 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
@@ -45,7 +45,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -85,7 +85,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -105,7 +105,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -125,7 +125,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -145,7 +145,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -165,7 +165,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -185,7 +185,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
index 24854aa662ab..8aa00e822f01 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
@@ -100,7 +100,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_string")
@@ -120,7 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_number")
@@ -140,7 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_integer")
@@ -160,7 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_boolean")
@@ -188,7 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("wrapped_array")
@@ -208,7 +208,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_string")
@@ -228,7 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_number")
@@ -248,7 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_integer")
@@ -268,7 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_boolean")
@@ -296,7 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_array")
@@ -324,7 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_wrapped_array")
@@ -344,7 +344,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_string")
@@ -364,7 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_number")
@@ -384,7 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_integer")
@@ -404,7 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_boolean")
@@ -432,7 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_array")
@@ -460,7 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_wrapped_array")
@@ -480,7 +480,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_string")
@@ -500,7 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_number")
@@ -520,7 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_integer")
@@ -540,7 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_boolean")
@@ -568,7 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_array")
@@ -596,7 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_wrapped_array")
@@ -616,7 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_string")
@@ -636,7 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_number")
@@ -656,7 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_integer")
@@ -676,7 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_boolean")
@@ -704,7 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_array")
@@ -732,7 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
index ebbaf3dee07d..32b5ecfeddf4 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
index 41b44e207bcc..8d901a7a9090 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
index b735d6ed92a6..68fa4c143f60 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
@@ -99,7 +99,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -119,7 +119,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -139,7 +139,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -167,7 +167,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -195,7 +195,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -215,7 +215,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
index 41b44e207bcc..8d901a7a9090 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index 3b189e40e656..3c1deb5719d2 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
index 41b44e207bcc..8d901a7a9090 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
index 3b189e40e656..3c1deb5719d2 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
index 41b44e207bcc..8d901a7a9090 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
index 3b189e40e656..3c1deb5719d2 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
index aa7c26d30fda..c2ff8401326f 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
@@ -34,7 +34,7 @@ public Addressable href(String href) {
   /**
    * Hyperlink reference
    * @return href
-  */
+   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("href")
@@ -54,7 +54,7 @@ public Addressable id(String id) {
   /**
    * unique identifier
    * @return id
-  */
+   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java
index 923f6c057a0b..0188b95dea00 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Apple.java
@@ -49,7 +49,7 @@ public Apple seeds(Integer seeds) {
   /**
    * Get seeds
    * @return seeds
-  */
+   */
   @NotNull 
   @Schema(name = "seeds", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("seeds")
@@ -69,7 +69,7 @@ public Apple fruitType(FruitType fruitType) {
   /**
    * Get fruitType
    * @return fruitType
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "fruitType", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("fruitType")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java
index 914c78a8f96c..c33eae2bc714 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Banana.java
@@ -49,7 +49,7 @@ public Banana length(Integer length) {
   /**
    * Get length
    * @return length
-  */
+   */
   @NotNull 
   @Schema(name = "length", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("length")
@@ -69,7 +69,7 @@ public Banana fruitType(FruitType fruitType) {
   /**
    * Get fruitType
    * @return fruitType
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "fruitType", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("fruitType")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
index e27db3920461..2a01186cb849 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
@@ -55,7 +55,7 @@ public Bar id(String id) {
   /**
    * Get id
    * @return id
-  */
+   */
   @NotNull 
   @Schema(name = "id", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("id")
@@ -75,7 +75,7 @@ public Bar barPropA(String barPropA) {
   /**
    * Get barPropA
    * @return barPropA
-  */
+   */
   
   @Schema(name = "barPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("barPropA")
@@ -95,7 +95,7 @@ public Bar fooPropB(String fooPropB) {
   /**
    * Get fooPropB
    * @return fooPropB
-  */
+   */
   
   @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("fooPropB")
@@ -115,7 +115,7 @@ public Bar foo(FooRefOrValue foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   @Valid 
   @Schema(name = "foo", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foo")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
index 32e6dbb3678e..ebb633fc78b3 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
@@ -54,7 +54,7 @@ public BarCreate barPropA(String barPropA) {
   /**
    * Get barPropA
    * @return barPropA
-  */
+   */
   
   @Schema(name = "barPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("barPropA")
@@ -74,7 +74,7 @@ public BarCreate fooPropB(String fooPropB) {
   /**
    * Get fooPropB
    * @return fooPropB
-  */
+   */
   
   @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("fooPropB")
@@ -94,7 +94,7 @@ public BarCreate foo(FooRefOrValue foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   @Valid 
   @Schema(name = "foo", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foo")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
index 284771ed5997..6661e2bee71d 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
@@ -67,7 +67,7 @@ public Entity href(String href) {
   /**
    * Hyperlink reference
    * @return href
-  */
+   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("href")
@@ -87,7 +87,7 @@ public Entity id(String id) {
   /**
    * unique identifier
    * @return id
-  */
+   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -107,7 +107,7 @@ public Entity atSchemaLocation(String atSchemaLocation) {
   /**
    * A URI to a JSON-Schema file that defines additional attributes and relationships
    * @return atSchemaLocation
-  */
+   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("@schemaLocation")
@@ -127,7 +127,7 @@ public Entity atBaseType(String atBaseType) {
   /**
    * When sub-classing, this defines the super-class
    * @return atBaseType
-  */
+   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("@baseType")
@@ -147,7 +147,7 @@ public Entity atType(String atType) {
   /**
    * When sub-classing, this defines the sub-class Extensible name
    * @return atType
-  */
+   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("@type")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
index f0b5f656476a..4a4cad51941b 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
@@ -68,7 +68,7 @@ public EntityRef name(String name) {
   /**
    * Name of the related entity.
    * @return name
-  */
+   */
   
   @Schema(name = "name", description = "Name of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
@@ -88,7 +88,7 @@ public EntityRef atReferredType(String atReferredType) {
   /**
    * The actual type of the target instance when needed for disambiguation.
    * @return atReferredType
-  */
+   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("@referredType")
@@ -108,7 +108,7 @@ public EntityRef href(String href) {
   /**
    * Hyperlink reference
    * @return href
-  */
+   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("href")
@@ -128,7 +128,7 @@ public EntityRef id(String id) {
   /**
    * unique identifier
    * @return id
-  */
+   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -148,7 +148,7 @@ public EntityRef atSchemaLocation(String atSchemaLocation) {
   /**
    * A URI to a JSON-Schema file that defines additional attributes and relationships
    * @return atSchemaLocation
-  */
+   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("@schemaLocation")
@@ -168,7 +168,7 @@ public EntityRef atBaseType(String atBaseType) {
   /**
    * When sub-classing, this defines the super-class
    * @return atBaseType
-  */
+   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("@baseType")
@@ -188,7 +188,7 @@ public EntityRef atType(String atType) {
   /**
    * When sub-classing, this defines the sub-class Extensible name
    * @return atType
-  */
+   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("@type")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
index 160cbb673d5a..555a8538fb45 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
@@ -46,7 +46,7 @@ public Extensible atSchemaLocation(String atSchemaLocation) {
   /**
    * A URI to a JSON-Schema file that defines additional attributes and relationships
    * @return atSchemaLocation
-  */
+   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("@schemaLocation")
@@ -66,7 +66,7 @@ public Extensible atBaseType(String atBaseType) {
   /**
    * When sub-classing, this defines the super-class
    * @return atBaseType
-  */
+   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("@baseType")
@@ -86,7 +86,7 @@ public Extensible atType(String atType) {
   /**
    * When sub-classing, this defines the sub-class Extensible name
    * @return atType
-  */
+   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("@type")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
index 25ad0bc6d687..de1d2c73ec19 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
@@ -49,7 +49,7 @@ public Foo fooPropA(String fooPropA) {
   /**
    * Get fooPropA
    * @return fooPropA
-  */
+   */
   
   @Schema(name = "fooPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("fooPropA")
@@ -69,7 +69,7 @@ public Foo fooPropB(String fooPropB) {
   /**
    * Get fooPropB
    * @return fooPropB
-  */
+   */
   
   @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("fooPropB")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
index 0ab64eee17a2..a554c25cc150 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
@@ -47,7 +47,7 @@ public FooRef foorefPropA(String foorefPropA) {
   /**
    * Get foorefPropA
    * @return foorefPropA
-  */
+   */
   
   @Schema(name = "foorefPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foorefPropA")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java
index 94d04f493d52..5b183d02812f 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java
@@ -47,7 +47,7 @@ public Pasta vendor(String vendor) {
   /**
    * Get vendor
    * @return vendor
-  */
+   */
   
   @Schema(name = "vendor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("vendor")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java
index ff42417f0b78..753fbf72bf1b 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java
@@ -56,7 +56,7 @@ public Pizza pizzaSize(BigDecimal pizzaSize) {
   /**
    * Get pizzaSize
    * @return pizzaSize
-  */
+   */
   @Valid 
   @Schema(name = "pizzaSize", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("pizzaSize")
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java
index 07cca324df17..0db193af1197 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java
@@ -48,7 +48,7 @@ public PizzaSpeziale toppings(String toppings) {
   /**
    * Get toppings
    * @return toppings
-  */
+   */
   
   @Schema(name = "toppings", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("toppings")
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
index 41b44e207bcc..8d901a7a9090 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
index 3b189e40e656..3c1deb5719d2 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
index bd208eedb503..5917b8b26f46 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
@@ -10,6 +10,7 @@
 import jakarta.validation.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.xml.bind.annotation.*;
@@ -25,7 +26,6 @@
 @JacksonXmlRootElement(localName = "Category")
 @XmlRootElement(name = "Category")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Category {
 
@@ -38,8 +38,8 @@ public Category() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Category(Long id, String name) {
       this.id = id;
       this.name = name;
@@ -53,11 +53,12 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -74,11 +75,12 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
+  @XmlElement(name = "name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
index c1510ebed196..be9dec71debe 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -11,6 +11,7 @@
 import jakarta.validation.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.xml.bind.annotation.*;
@@ -27,7 +28,6 @@
 @JacksonXmlRootElement(localName = "ModelApiResponse")
 @XmlRootElement(name = "ModelApiResponse")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class ModelApiResponse {
 
@@ -42,8 +42,8 @@ public ModelApiResponse() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelApiResponse(Integer code, String type, String message) {
       this.code = code;
       this.type = type;
@@ -58,11 +58,12 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
   @JacksonXmlProperty(localName = "code")
+  @XmlElement(name = "code")
   public Integer getCode() {
     return code;
   }
@@ -79,11 +80,12 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
   @JacksonXmlProperty(localName = "type")
+  @XmlElement(name = "type")
   public String getType() {
     return type;
   }
@@ -100,11 +102,12 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
   @JacksonXmlProperty(localName = "message")
+  @XmlElement(name = "message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
index ea4739c7a8b7..a272b1deb4c5 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
@@ -13,6 +13,7 @@
 import jakarta.validation.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.xml.bind.annotation.*;
@@ -28,7 +29,6 @@
 @JacksonXmlRootElement(localName = "Order")
 @XmlRootElement(name = "Order")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Order {
 
@@ -87,8 +87,8 @@ public Order() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Order(Long id, Long petId, Integer quantity, OffsetDateTime shipDate, StatusEnum status, Boolean complete) {
       this.id = id;
       this.petId = petId;
@@ -106,11 +106,12 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -127,11 +128,12 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
   @JacksonXmlProperty(localName = "petId")
+  @XmlElement(name = "petId")
   public Long getPetId() {
     return petId;
   }
@@ -148,11 +150,12 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
   @JacksonXmlProperty(localName = "quantity")
+  @XmlElement(name = "quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -169,11 +172,12 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
   @JacksonXmlProperty(localName = "shipDate")
+  @XmlElement(name = "shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -190,11 +194,12 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
   @JacksonXmlProperty(localName = "status")
+  @XmlElement(name = "status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -211,11 +216,12 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
   @JacksonXmlProperty(localName = "complete")
+  @XmlElement(name = "complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
index 6354100a9239..70282d91a2af 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
@@ -16,6 +16,7 @@
 import jakarta.validation.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.xml.bind.annotation.*;
@@ -31,7 +32,6 @@
 @JacksonXmlRootElement(localName = "Pet")
 @XmlRootElement(name = "Pet")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Pet {
 
@@ -100,8 +100,8 @@ public Pet(String name, List<String> photoUrls) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Pet(Long id, Category category, String name, List<String> photoUrls, List<@Valid Tag> tags, StatusEnum status) {
       this.id = id;
       this.category = category;
@@ -119,11 +119,12 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -140,11 +141,12 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
   @JacksonXmlProperty(localName = "Category")
+  @XmlElement(name = "Category")
   public Category getCategory() {
     return category;
   }
@@ -161,11 +163,12 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
+  @XmlElement(name = "name")
   public String getName() {
     return name;
   }
@@ -190,11 +193,14 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
   @JacksonXmlProperty(localName = "photoUrl")
+  @JacksonXmlElementWrapper(localName = "photoUrl", useWrapping = true)
+  @XmlElement(name = "photoUrl")
+  @XmlElementWrapper(name = "photoUrl")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -219,11 +225,14 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
-  @JacksonXmlProperty(localName = "tag")
+  @JacksonXmlProperty(localName = "Tag")
+  @JacksonXmlElementWrapper(localName = "tag", useWrapping = true)
+  @XmlElement(name = "Tag")
+  @XmlElementWrapper(name = "tag")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -241,11 +250,12 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
   @JacksonXmlProperty(localName = "status")
+  @XmlElement(name = "status")
   @Deprecated
   public StatusEnum getStatus() {
     return status;
@@ -253,7 +263,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
index 3834f2ef972a..2e47e0a1b17d 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
@@ -10,6 +10,7 @@
 import jakarta.validation.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.xml.bind.annotation.*;
@@ -25,7 +26,6 @@
 @JacksonXmlRootElement(localName = "Tag")
 @XmlRootElement(name = "Tag")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Tag {
 
@@ -38,8 +38,8 @@ public Tag() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Tag(Long id, String name) {
       this.id = id;
       this.name = name;
@@ -53,11 +53,12 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -74,11 +75,12 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
+  @XmlElement(name = "name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
index a8ddac3951a1..8cdcb604b1c7 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
@@ -10,6 +10,7 @@
 import jakarta.validation.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import jakarta.xml.bind.annotation.*;
@@ -25,7 +26,6 @@
 @JacksonXmlRootElement(localName = "User")
 @XmlRootElement(name = "User")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class User {
 
@@ -50,8 +50,8 @@ public User() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public User(Long id, String username, String firstName, String lastName, String email, String password, String phone, Integer userStatus) {
       this.id = id;
       this.username = username;
@@ -71,11 +71,12 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -92,11 +93,12 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
   @JacksonXmlProperty(localName = "username")
+  @XmlElement(name = "username")
   public String getUsername() {
     return username;
   }
@@ -113,11 +115,12 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
   @JacksonXmlProperty(localName = "firstName")
+  @XmlElement(name = "firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -134,11 +137,12 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
   @JacksonXmlProperty(localName = "lastName")
+  @XmlElement(name = "lastName")
   public String getLastName() {
     return lastName;
   }
@@ -155,11 +159,12 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
   @JacksonXmlProperty(localName = "email")
+  @XmlElement(name = "email")
   public String getEmail() {
     return email;
   }
@@ -176,11 +181,12 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
   @JacksonXmlProperty(localName = "password")
+  @XmlElement(name = "password")
   public String getPassword() {
     return password;
   }
@@ -197,11 +203,12 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
   @JacksonXmlProperty(localName = "phone")
+  @XmlElement(name = "phone")
   public String getPhone() {
     return phone;
   }
@@ -218,11 +225,12 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
   @JacksonXmlProperty(localName = "userStatus")
+  @XmlElement(name = "userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index ccf633751956..70ed8b093357 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 6881dd234e17..7a124362197e 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 295ce50f7d58..be06c451b7b8 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index caec6d926511..c73cda71e006 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -74,7 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_string")
@@ -102,7 +102,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_number")
@@ -130,7 +130,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_integer")
@@ -158,7 +158,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_boolean")
@@ -186,7 +186,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_integer")
@@ -214,7 +214,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_anytype")
@@ -242,7 +242,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_string")
@@ -270,7 +270,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_anytype")
@@ -290,7 +290,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_1")
@@ -310,7 +310,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_2")
@@ -330,7 +330,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_3")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 02be3686067d..3b43d0da3584 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5be86fba0911..97d02674ec68 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index a47f4357de62..4fdc0b050153 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index ae794e96ff2c..9b045ffebb07 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
index c82a3d8a8aeb..818edc2cb5a6 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("color")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 0278df289037..a3e3f1b10250 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a2ed8c168b39..7a8a52168934 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayNumber")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
index fb1a17cd7877..b556efec6550 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
@@ -50,7 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_of_string")
@@ -78,7 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_integer")
@@ -106,7 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_model")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
index e499e9aa26a5..65fcc1ca36ec 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
@@ -87,7 +87,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("kind")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
index e9804c9a1e6e..7408b8cb7aa5 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
@@ -41,7 +41,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("smallCamel")
@@ -61,7 +61,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("CapitalCamel")
@@ -81,7 +81,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("small_Snake")
@@ -101,7 +101,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("Capital_Snake")
@@ -121,7 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -141,7 +141,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ATT_NAME")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
index bf614bb89d66..e8c0d1795dd9 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
@@ -55,7 +55,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("declawed")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
index ab4860b0fb3e..2c6491659974 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -44,7 +44,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -64,7 +64,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java
index de66f6c719b6..46a462be8e3c 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -39,7 +39,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @Schema(name = "otherProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("otherProperty")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
index 9e27d3d33a4d..6126b788dede 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
@@ -32,7 +32,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("_class")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
index afd91d6c5fbd..21723cd0378f 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
@@ -31,7 +31,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("client")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index ad3a548f2ff2..226b605be001 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -66,7 +66,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array")
@@ -94,7 +94,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("nullable_required_array")
@@ -122,7 +122,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("required_array")
@@ -150,7 +150,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
index 81f91c77bee9..c277d3de45c1 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
@@ -47,7 +47,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("breed")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
index afdb86d0c6af..efa05bc32eab 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
@@ -108,7 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("just_symbol")
@@ -136,7 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_enum")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
index b222585be9fe..0b0823361034 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
@@ -198,7 +198,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_string")
@@ -218,7 +218,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("enum_string_required")
@@ -238,7 +238,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_integer")
@@ -258,7 +258,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_number")
@@ -278,7 +278,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("outerEnum")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
index b3a80b466d72..ec96357bbb76 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
@@ -32,7 +32,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("sourceURI")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index c19c90547eab..0fafd2083e8b 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -38,7 +38,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("file")
@@ -66,7 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("files")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
index 69c619a4ff54..0c78c317222b 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -83,7 +83,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
@@ -105,7 +105,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int32")
@@ -125,7 +125,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int64")
@@ -147,7 +147,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number")
@@ -169,7 +169,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("float")
@@ -191,7 +191,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("double")
@@ -211,7 +211,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
@@ -231,7 +231,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("byte")
@@ -251,7 +251,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("binary")
@@ -271,7 +271,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
@@ -291,7 +291,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -311,7 +311,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -331,7 +331,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("password")
@@ -351,7 +351,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index e504791906c5..e2088c2e7782 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -35,7 +35,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -55,7 +55,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foo")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
index 36ae89dbc171..65991c277fb3 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
@@ -87,7 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_of_string")
@@ -115,7 +115,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_of_enum_string")
@@ -143,7 +143,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("direct_map")
@@ -171,7 +171,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("indirect_map")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 020d04b7411e..a371a767e67d 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -43,7 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -63,7 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -91,7 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
index 9ffa25ca597d..2a46d99bad50 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
@@ -36,7 +36,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
@@ -56,7 +56,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("class")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
index cbdfaeca7dc3..8e2e78236c71 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -37,7 +37,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -57,7 +57,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -77,7 +77,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
index 5bec1e4192a8..f77cc933f6d6 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
@@ -33,7 +33,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123-list")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
index 92c63607830b..613a20b8a24a 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
@@ -34,7 +34,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("return")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
index 1309621e88fd..078e4b6cb883 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
@@ -49,7 +49,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -69,7 +69,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("snake_case")
@@ -89,7 +89,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property")
@@ -109,7 +109,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123Number")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java
index 0cb8288e4022..d31209ccafc4 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -45,7 +45,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @Schema(name = "languageValues", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("languageValues")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
index 46b1d19305d9..d6ad5164f1c0 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
@@ -32,7 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("JustNumber")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
index 4c2cf39daf1f..9e452a29b1df 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
@@ -82,7 +82,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -102,7 +102,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -122,7 +122,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -142,7 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -162,7 +162,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -182,7 +182,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
index 5ddc334ca0e0..9fc1f16c5b49 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
@@ -36,7 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_number")
@@ -56,7 +56,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_string")
@@ -76,7 +76,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_boolean")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1749253b10ed..26366e74fb4d 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -82,7 +82,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -102,7 +102,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @Schema(name = "nullableProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullableProperty")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index 780b2ff19f42..f9990b4d4b95 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -102,7 +102,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -122,7 +122,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -142,7 +142,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -170,7 +170,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -220,7 +220,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -231,7 +231,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 83608394b3ac..d881cbb0a8b3 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -33,7 +33,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -53,7 +53,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("baz")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 5f604c887303..9f6c5494cc9a 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -37,7 +37,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("normalPropertyName")
@@ -57,7 +57,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -77,7 +77,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lower-case-property-dashes")
@@ -97,7 +97,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property name with spaces")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
index 03b736e43ffc..9397b3b4a00e 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -33,7 +33,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("$special[property.name]")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
index e51dc6e80b9b..50945536995a 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
@@ -33,7 +33,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
index c724cf1aa729..3155f598ad37 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -59,7 +59,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -79,7 +79,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -99,7 +99,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -119,7 +119,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -147,7 +147,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
index eef6062e39e2..202e1a07b43d 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -62,7 +62,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -82,7 +82,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -102,7 +102,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("float_item")
@@ -122,7 +122,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -142,7 +142,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -170,7 +170,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
index cf2938851e83..fa92088bda97 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
@@ -45,7 +45,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -85,7 +85,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -105,7 +105,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -125,7 +125,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -145,7 +145,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -165,7 +165,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -185,7 +185,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
index 24854aa662ab..8aa00e822f01 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
@@ -100,7 +100,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_string")
@@ -120,7 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_number")
@@ -140,7 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_integer")
@@ -160,7 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_boolean")
@@ -188,7 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("wrapped_array")
@@ -208,7 +208,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_string")
@@ -228,7 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_number")
@@ -248,7 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_integer")
@@ -268,7 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_boolean")
@@ -296,7 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_array")
@@ -324,7 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_wrapped_array")
@@ -344,7 +344,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_string")
@@ -364,7 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_number")
@@ -384,7 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_integer")
@@ -404,7 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_boolean")
@@ -432,7 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_array")
@@ -460,7 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_wrapped_array")
@@ -480,7 +480,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_string")
@@ -500,7 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_number")
@@ -520,7 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_integer")
@@ -540,7 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_boolean")
@@ -568,7 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_array")
@@ -596,7 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_wrapped_array")
@@ -616,7 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_string")
@@ -636,7 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_number")
@@ -656,7 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_integer")
@@ -676,7 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_boolean")
@@ -704,7 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_array")
@@ -732,7 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index ccf633751956..70ed8b093357 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 6881dd234e17..7a124362197e 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 295ce50f7d58..be06c451b7b8 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index caec6d926511..c73cda71e006 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -74,7 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_string")
@@ -102,7 +102,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_number")
@@ -130,7 +130,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_integer")
@@ -158,7 +158,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_boolean")
@@ -186,7 +186,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_integer")
@@ -214,7 +214,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_anytype")
@@ -242,7 +242,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_string")
@@ -270,7 +270,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_anytype")
@@ -290,7 +290,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_1")
@@ -310,7 +310,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_2")
@@ -330,7 +330,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_3")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 02be3686067d..3b43d0da3584 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5be86fba0911..97d02674ec68 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index a47f4357de62..4fdc0b050153 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index ae794e96ff2c..9b045ffebb07 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
index c82a3d8a8aeb..818edc2cb5a6 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("color")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 0278df289037..a3e3f1b10250 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a2ed8c168b39..7a8a52168934 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayNumber")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
index fb1a17cd7877..b556efec6550 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
@@ -50,7 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_of_string")
@@ -78,7 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_integer")
@@ -106,7 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_model")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
index e499e9aa26a5..65fcc1ca36ec 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
@@ -87,7 +87,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("kind")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
index e9804c9a1e6e..7408b8cb7aa5 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
@@ -41,7 +41,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("smallCamel")
@@ -61,7 +61,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("CapitalCamel")
@@ -81,7 +81,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("small_Snake")
@@ -101,7 +101,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("Capital_Snake")
@@ -121,7 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -141,7 +141,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ATT_NAME")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
index bf614bb89d66..e8c0d1795dd9 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
@@ -55,7 +55,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("declawed")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
index ab4860b0fb3e..2c6491659974 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
@@ -44,7 +44,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -64,7 +64,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java
index de66f6c719b6..46a462be8e3c 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -39,7 +39,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @Schema(name = "otherProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("otherProperty")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
index 9e27d3d33a4d..6126b788dede 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
@@ -32,7 +32,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("_class")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
index afd91d6c5fbd..21723cd0378f 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
@@ -31,7 +31,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("client")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index ad3a548f2ff2..226b605be001 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -66,7 +66,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array")
@@ -94,7 +94,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("nullable_required_array")
@@ -122,7 +122,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("required_array")
@@ -150,7 +150,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
index 81f91c77bee9..c277d3de45c1 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
@@ -47,7 +47,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("breed")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
index afdb86d0c6af..efa05bc32eab 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
@@ -108,7 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("just_symbol")
@@ -136,7 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_enum")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
index b222585be9fe..0b0823361034 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
@@ -198,7 +198,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_string")
@@ -218,7 +218,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("enum_string_required")
@@ -238,7 +238,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_integer")
@@ -258,7 +258,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_number")
@@ -278,7 +278,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("outerEnum")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
index b3a80b466d72..ec96357bbb76 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
@@ -32,7 +32,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("sourceURI")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index c19c90547eab..0fafd2083e8b 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -38,7 +38,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("file")
@@ -66,7 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("files")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
index 69c619a4ff54..0c78c317222b 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -83,7 +83,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
@@ -105,7 +105,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int32")
@@ -125,7 +125,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int64")
@@ -147,7 +147,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number")
@@ -169,7 +169,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("float")
@@ -191,7 +191,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("double")
@@ -211,7 +211,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
@@ -231,7 +231,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("byte")
@@ -251,7 +251,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("binary")
@@ -271,7 +271,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
@@ -291,7 +291,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -311,7 +311,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -331,7 +331,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("password")
@@ -351,7 +351,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index e504791906c5..e2088c2e7782 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -35,7 +35,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -55,7 +55,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foo")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
index 36ae89dbc171..65991c277fb3 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
@@ -87,7 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_of_string")
@@ -115,7 +115,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_of_enum_string")
@@ -143,7 +143,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("direct_map")
@@ -171,7 +171,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("indirect_map")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 020d04b7411e..a371a767e67d 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -43,7 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -63,7 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -91,7 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
index 9ffa25ca597d..2a46d99bad50 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
@@ -36,7 +36,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
@@ -56,7 +56,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("class")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
index cbdfaeca7dc3..8e2e78236c71 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -37,7 +37,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -57,7 +57,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -77,7 +77,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
index 5bec1e4192a8..f77cc933f6d6 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
@@ -33,7 +33,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123-list")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
index 92c63607830b..613a20b8a24a 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
@@ -34,7 +34,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("return")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
index 1309621e88fd..078e4b6cb883 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
@@ -49,7 +49,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -69,7 +69,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("snake_case")
@@ -89,7 +89,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property")
@@ -109,7 +109,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123Number")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java
index 0cb8288e4022..d31209ccafc4 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -45,7 +45,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @Schema(name = "languageValues", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("languageValues")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
index 46b1d19305d9..d6ad5164f1c0 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
@@ -32,7 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("JustNumber")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
index 4c2cf39daf1f..9e452a29b1df 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
@@ -82,7 +82,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -102,7 +102,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -122,7 +122,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -142,7 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -162,7 +162,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -182,7 +182,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
index 5ddc334ca0e0..9fc1f16c5b49 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
@@ -36,7 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_number")
@@ -56,7 +56,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_string")
@@ -76,7 +76,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_boolean")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1749253b10ed..26366e74fb4d 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -82,7 +82,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -102,7 +102,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @Schema(name = "nullableProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullableProperty")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index 780b2ff19f42..f9990b4d4b95 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -102,7 +102,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -122,7 +122,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -142,7 +142,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -170,7 +170,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -220,7 +220,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -231,7 +231,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 83608394b3ac..d881cbb0a8b3 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -33,7 +33,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -53,7 +53,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("baz")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 5f604c887303..9f6c5494cc9a 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -37,7 +37,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("normalPropertyName")
@@ -57,7 +57,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -77,7 +77,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lower-case-property-dashes")
@@ -97,7 +97,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property name with spaces")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
index 03b736e43ffc..9397b3b4a00e 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -33,7 +33,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("$special[property.name]")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
index e51dc6e80b9b..50945536995a 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
@@ -33,7 +33,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
index c724cf1aa729..3155f598ad37 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -59,7 +59,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -79,7 +79,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -99,7 +99,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -119,7 +119,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -147,7 +147,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
index eef6062e39e2..202e1a07b43d 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -62,7 +62,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -82,7 +82,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -102,7 +102,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("float_item")
@@ -122,7 +122,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -142,7 +142,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -170,7 +170,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
index cf2938851e83..fa92088bda97 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
@@ -45,7 +45,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -85,7 +85,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -105,7 +105,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -125,7 +125,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -145,7 +145,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -165,7 +165,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -185,7 +185,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
index 24854aa662ab..8aa00e822f01 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
@@ -100,7 +100,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_string")
@@ -120,7 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_number")
@@ -140,7 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_integer")
@@ -160,7 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_boolean")
@@ -188,7 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("wrapped_array")
@@ -208,7 +208,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_string")
@@ -228,7 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_number")
@@ -248,7 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_integer")
@@ -268,7 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_boolean")
@@ -296,7 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_array")
@@ -324,7 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_wrapped_array")
@@ -344,7 +344,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_string")
@@ -364,7 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_number")
@@ -384,7 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_integer")
@@ -404,7 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_boolean")
@@ -432,7 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_array")
@@ -460,7 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_wrapped_array")
@@ -480,7 +480,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_string")
@@ -500,7 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_number")
@@ -520,7 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_integer")
@@ -540,7 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_boolean")
@@ -568,7 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_array")
@@ -596,7 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_wrapped_array")
@@ -616,7 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_string")
@@ -636,7 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_number")
@@ -656,7 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_integer")
@@ -676,7 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_boolean")
@@ -704,7 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_array")
@@ -732,7 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
index e72bc5e208ba..629a49c7b1b6 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
@@ -32,7 +32,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -51,7 +51,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
index b67c92199581..a688be430786 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -36,7 +36,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @JsonProperty("code")
   public Integer getCode() {
@@ -55,7 +55,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @JsonProperty("type")
   public String getType() {
@@ -74,7 +74,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @JsonProperty("message")
   public String getMessage() {
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
index f42addfd951b..44836427f48b 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
@@ -81,7 +81,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -100,7 +100,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @JsonProperty("petId")
   public Long getPetId() {
@@ -119,7 +119,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @JsonProperty("quantity")
   public Integer getQuantity() {
@@ -138,7 +138,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
@@ -157,7 +157,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @JsonProperty("status")
   public StatusEnum getStatus() {
@@ -176,7 +176,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @JsonProperty("complete")
   public Boolean getComplete() {
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
index 1a6771689c49..2cfd01b39027 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
@@ -98,7 +98,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -117,7 +117,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @JsonProperty("category")
   public Category getCategory() {
@@ -136,7 +136,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @JsonProperty("name")
   public String getName() {
@@ -163,7 +163,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
@@ -190,7 +190,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
@@ -210,7 +210,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @JsonProperty("status")
   @Deprecated
@@ -220,7 +220,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
index c287674666ee..d754b75d6a16 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
@@ -32,7 +32,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -51,7 +51,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
index d6044eeb7855..e64e514efd16 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
@@ -44,7 +44,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -63,7 +63,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @JsonProperty("username")
   public String getUsername() {
@@ -82,7 +82,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @JsonProperty("firstName")
   public String getFirstName() {
@@ -101,7 +101,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @JsonProperty("lastName")
   public String getLastName() {
@@ -120,7 +120,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @JsonProperty("email")
   public String getEmail() {
@@ -139,7 +139,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @JsonProperty("password")
   public String getPassword() {
@@ -158,7 +158,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @JsonProperty("phone")
   public String getPhone() {
@@ -177,7 +177,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
index 38df50045697..c43530017f03 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
@@ -34,7 +34,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5cf7f8d2c1c0..2fe0744b7597 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
index 41b44e207bcc..8d901a7a9090 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
index 3b189e40e656..3c1deb5719d2 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
@@ -100,7 +100,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -120,7 +120,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -140,7 +140,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -168,7 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -196,7 +196,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -217,7 +217,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -228,7 +228,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
index 70c7259427b4..5147e0d0be0f 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
index 1806e342c6db..888a0fa11a15 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
index 405729428599..3f88e13d895f 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
@@ -11,6 +11,7 @@
 import org.hibernate.validator.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.*;
@@ -26,7 +27,6 @@
 @JacksonXmlRootElement(localName = "Category")
 @XmlRootElement(name = "Category")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Category {
 
@@ -42,11 +42,12 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -63,11 +64,12 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
+  @XmlElement(name = "name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
index 2694998b250e..e84740d7a1ef 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -12,6 +12,7 @@
 import org.hibernate.validator.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.*;
@@ -28,7 +29,6 @@
 @JacksonXmlRootElement(localName = "ModelApiResponse")
 @XmlRootElement(name = "ModelApiResponse")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class ModelApiResponse {
 
@@ -46,11 +46,12 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
   @JacksonXmlProperty(localName = "code")
+  @XmlElement(name = "code")
   public Integer getCode() {
     return code;
   }
@@ -67,11 +68,12 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
   @JacksonXmlProperty(localName = "type")
+  @XmlElement(name = "type")
   public String getType() {
     return type;
   }
@@ -88,11 +90,12 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
   @JacksonXmlProperty(localName = "message")
+  @XmlElement(name = "message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
index 0d03894d4e57..b94cabad22f5 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
@@ -14,6 +14,7 @@
 import org.hibernate.validator.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.*;
@@ -29,7 +30,6 @@
 @JacksonXmlRootElement(localName = "Order")
 @XmlRootElement(name = "Order")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Order {
 
@@ -91,11 +91,12 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -112,11 +113,12 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
   @JacksonXmlProperty(localName = "petId")
+  @XmlElement(name = "petId")
   public Long getPetId() {
     return petId;
   }
@@ -133,11 +135,12 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
   @JacksonXmlProperty(localName = "quantity")
+  @XmlElement(name = "quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -154,11 +157,12 @@ public Order shipDate(Date shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
   @JacksonXmlProperty(localName = "shipDate")
+  @XmlElement(name = "shipDate")
   public Date getShipDate() {
     return shipDate;
   }
@@ -175,11 +179,12 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
   @JacksonXmlProperty(localName = "status")
+  @XmlElement(name = "status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -196,11 +201,12 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
   @JacksonXmlProperty(localName = "complete")
+  @XmlElement(name = "complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
index 0c170455ef55..14562f78fb37 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
@@ -17,6 +17,7 @@
 import org.hibernate.validator.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.*;
@@ -32,7 +33,6 @@
 @JacksonXmlRootElement(localName = "Pet")
 @XmlRootElement(name = "Pet")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Pet {
 
@@ -108,11 +108,12 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -129,11 +130,12 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
   @JacksonXmlProperty(localName = "Category")
+  @XmlElement(name = "Category")
   public Category getCategory() {
     return category;
   }
@@ -150,11 +152,12 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
+  @XmlElement(name = "name")
   public String getName() {
     return name;
   }
@@ -179,11 +182,14 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
   @JacksonXmlProperty(localName = "photoUrl")
+  @JacksonXmlElementWrapper(localName = "photoUrl", useWrapping = true)
+  @XmlElement(name = "photoUrl")
+  @XmlElementWrapper(name = "photoUrl")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -208,11 +214,14 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
-  @JacksonXmlProperty(localName = "tag")
+  @JacksonXmlProperty(localName = "Tag")
+  @JacksonXmlElementWrapper(localName = "tag", useWrapping = true)
+  @XmlElement(name = "Tag")
+  @XmlElementWrapper(name = "tag")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -230,11 +239,12 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
   @JacksonXmlProperty(localName = "status")
+  @XmlElement(name = "status")
   @Deprecated
   public StatusEnum getStatus() {
     return status;
@@ -242,7 +252,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
index 733478d43a29..47534cc67ba2 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
@@ -11,6 +11,7 @@
 import org.hibernate.validator.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.*;
@@ -26,7 +27,6 @@
 @JacksonXmlRootElement(localName = "Tag")
 @XmlRootElement(name = "Tag")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class Tag {
 
@@ -42,11 +42,12 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -63,11 +64,12 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
+  @XmlElement(name = "name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
index 38a8a5c95dd0..7a408335162e 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
@@ -11,6 +11,7 @@
 import org.hibernate.validator.constraints.*;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement;
 import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty;
+import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import javax.xml.bind.annotation.*;
@@ -26,7 +27,6 @@
 @JacksonXmlRootElement(localName = "User")
 @XmlRootElement(name = "User")
 @XmlAccessorType(XmlAccessType.FIELD)
-
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen", comments = "Generator version: 7.7.0-SNAPSHOT")
 public class User {
 
@@ -54,11 +54,12 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
+  @XmlElement(name = "id")
   public Long getId() {
     return id;
   }
@@ -75,11 +76,12 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
   @JacksonXmlProperty(localName = "username")
+  @XmlElement(name = "username")
   public String getUsername() {
     return username;
   }
@@ -96,11 +98,12 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
   @JacksonXmlProperty(localName = "firstName")
+  @XmlElement(name = "firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -117,11 +120,12 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
   @JacksonXmlProperty(localName = "lastName")
+  @XmlElement(name = "lastName")
   public String getLastName() {
     return lastName;
   }
@@ -138,11 +142,12 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
   @JacksonXmlProperty(localName = "email")
+  @XmlElement(name = "email")
   public String getEmail() {
     return email;
   }
@@ -159,11 +164,12 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
   @JacksonXmlProperty(localName = "password")
+  @XmlElement(name = "password")
   public String getPassword() {
     return password;
   }
@@ -180,11 +186,12 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
   @JacksonXmlProperty(localName = "phone")
+  @XmlElement(name = "phone")
   public String getPhone() {
     return phone;
   }
@@ -201,11 +208,12 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
   @JacksonXmlProperty(localName = "userStatus")
+  @XmlElement(name = "userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
index 6fc0968bc33f..a08bc26cc144 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
index 6fc0968bc33f..a08bc26cc144 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
index 6fc0968bc33f..a08bc26cc144 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml
@@ -1560,10 +1560,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java
index d5cb5b5c95dd..93959c01a432 100644
--- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Category.java
@@ -51,7 +51,7 @@ public Category id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_ID)
@@ -74,7 +74,7 @@ public Category name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @Pattern(regexp="^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")
     @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java
index e34eb911efec..9074d6ad3074 100644
--- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -56,7 +56,7 @@ public ModelApiResponse code(Integer code) {
     /**
      * Get code
      * @return code
-     **/
+     */
     @Nullable
     @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_CODE)
@@ -79,7 +79,7 @@ public ModelApiResponse type(String type) {
     /**
      * Get type
      * @return type
-     **/
+     */
     @Nullable
     @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_TYPE)
@@ -102,7 +102,7 @@ public ModelApiResponse message(String message) {
     /**
      * Get message
      * @return message
-     **/
+     */
     @Nullable
     @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_MESSAGE)
diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java
index 0df44b72f89a..eadc2e3553e8 100644
--- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Order.java
@@ -102,7 +102,7 @@ public Order id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_ID)
@@ -125,7 +125,7 @@ public Order petId(Long petId) {
     /**
      * Get petId
      * @return petId
-     **/
+     */
     @Nullable
     @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_PET_ID)
@@ -148,7 +148,7 @@ public Order quantity(Integer quantity) {
     /**
      * Get quantity
      * @return quantity
-     **/
+     */
     @Nullable
     @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_QUANTITY)
@@ -171,7 +171,7 @@ public Order shipDate(OffsetDateTime shipDate) {
     /**
      * Get shipDate
      * @return shipDate
-     **/
+     */
     @Nullable
     @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_SHIP_DATE)
@@ -196,7 +196,7 @@ public Order status(StatusEnum status) {
     /**
      * Order Status
      * @return status
-     **/
+     */
     @Nullable
     @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_STATUS)
@@ -219,7 +219,7 @@ public Order complete(Boolean complete) {
     /**
      * Get complete
      * @return complete
-     **/
+     */
     @Nullable
     @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_COMPLETE)
diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java
index 52eed442b946..a212b39a869c 100644
--- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Pet.java
@@ -108,7 +108,7 @@ public Pet id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_ID)
@@ -131,7 +131,7 @@ public Pet category(Category category) {
     /**
      * Get category
      * @return category
-     **/
+     */
     @Valid
     @Nullable
     @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
@@ -155,7 +155,7 @@ public Pet name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @NotNull
     @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
     @JsonProperty(JSON_PROPERTY_NAME)
@@ -183,7 +183,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     /**
      * Get photoUrls
      * @return photoUrls
-     **/
+     */
     @NotNull
     @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
     @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
@@ -214,7 +214,7 @@ public Pet addTagsItem(Tag tagsItem) {
     /**
      * Get tags
      * @return tags
-     **/
+     */
     @Nullable
     @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_TAGS)
@@ -237,7 +237,7 @@ public Pet status(StatusEnum status) {
     /**
      * pet status in the store
      * @return status
-     **/
+     */
     @Nullable
     @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_STATUS)
diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java
index 44d884791134..d93647d8350d 100644
--- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/Tag.java
@@ -51,7 +51,7 @@ public Tag id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_ID)
@@ -74,7 +74,7 @@ public Tag name(String name) {
     /**
      * Get name
      * @return name
-     **/
+     */
     @Nullable
     @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_NAME)
diff --git a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java
index 13ce30f27031..dfc61fbfc7a8 100644
--- a/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/java-micronaut-server/src/main/java/org/openapitools/model/User.java
@@ -75,7 +75,7 @@ public User id(Long id) {
     /**
      * Get id
      * @return id
-     **/
+     */
     @Nullable
     @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_ID)
@@ -98,7 +98,7 @@ public User username(String username) {
     /**
      * Get username
      * @return username
-     **/
+     */
     @Nullable
     @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_USERNAME)
@@ -121,7 +121,7 @@ public User firstName(String firstName) {
     /**
      * Get firstName
      * @return firstName
-     **/
+     */
     @Nullable
     @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_FIRST_NAME)
@@ -144,7 +144,7 @@ public User lastName(String lastName) {
     /**
      * Get lastName
      * @return lastName
-     **/
+     */
     @Nullable
     @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_LAST_NAME)
@@ -167,7 +167,7 @@ public User email(String email) {
     /**
      * Get email
      * @return email
-     **/
+     */
     @Nullable
     @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_EMAIL)
@@ -190,7 +190,7 @@ public User password(String password) {
     /**
      * Get password
      * @return password
-     **/
+     */
     @Nullable
     @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -213,7 +213,7 @@ public User phone(String phone) {
     /**
      * Get phone
      * @return phone
-     **/
+     */
     @Nullable
     @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_PHONE)
@@ -236,7 +236,7 @@ public User userStatus(Integer userStatus) {
     /**
      * User Status
      * @return userStatus
-     **/
+     */
     @Nullable
     @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
     @JsonProperty(JSON_PROPERTY_USER_STATUS)
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Category.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Category.java
index 2437bd1de6d1..27b1cee8d497 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Category.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Category.java
@@ -26,7 +26,7 @@
 })
 /**
   * A category for a pet
- **/
+  */
 
 public class Category  {
   
@@ -38,10 +38,10 @@ public class Category  {
   
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -49,8 +49,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -62,10 +62,10 @@ public Category id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getName() {
@@ -73,8 +73,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
@@ -88,8 +88,8 @@ public Category name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/ModelApiResponse.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/ModelApiResponse.java
index 915f8a093e58..95ea601a2edc 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/ModelApiResponse.java
@@ -28,7 +28,7 @@
 @JsonTypeName("ApiResponse")
 /**
   * Describes the result of uploading an image resource
- **/
+  */
 
 public class ModelApiResponse  {
   
@@ -44,10 +44,10 @@ public class ModelApiResponse  {
   
   private String message;
 
- /**
+  /**
    * Get code
    * @return code
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getCode() {
@@ -55,8 +55,8 @@ public Integer getCode() {
   }
 
   /**
-    * Set code
-  **/
+   * Set code
+   */
   @JsonProperty(JSON_PROPERTY_CODE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCode(Integer code) {
@@ -68,10 +68,10 @@ public ModelApiResponse code(Integer code) {
     return this;
   }
 
- /**
+  /**
    * Get type
    * @return type
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getType() {
@@ -79,8 +79,8 @@ public String getType() {
   }
 
   /**
-    * Set type
-  **/
+   * Set type
+   */
   @JsonProperty(JSON_PROPERTY_TYPE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setType(String type) {
@@ -92,10 +92,10 @@ public ModelApiResponse type(String type) {
     return this;
   }
 
- /**
+  /**
    * Get message
    * @return message
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getMessage() {
@@ -103,8 +103,8 @@ public String getMessage() {
   }
 
   /**
-    * Set message
-  **/
+   * Set message
+   */
   @JsonProperty(JSON_PROPERTY_MESSAGE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setMessage(String message) {
@@ -118,8 +118,8 @@ public ModelApiResponse message(String message) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
index 977251b712e8..2a4482666e15 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Order.java
@@ -31,7 +31,7 @@
 })
 /**
   * An order for a pets from the pet store
- **/
+  */
 
 public class Order  {
   
@@ -85,8 +85,8 @@ public static StatusEnum fromValue(String value) {
 
   public static final String JSON_PROPERTY_STATUS = "status";
  /**
-   * Order Status
-  **/
+  * Order Status
+  */
   
   private StatusEnum status;
 
@@ -94,10 +94,10 @@ public static StatusEnum fromValue(String value) {
   
   private Boolean complete = false;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -105,8 +105,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -118,10 +118,10 @@ public Order id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get petId
    * @return petId
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getPetId() {
@@ -129,8 +129,8 @@ public Long getPetId() {
   }
 
   /**
-    * Set petId
-  **/
+   * Set petId
+   */
   @JsonProperty(JSON_PROPERTY_PET_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPetId(Long petId) {
@@ -142,10 +142,10 @@ public Order petId(Long petId) {
     return this;
   }
 
- /**
+  /**
    * Get quantity
    * @return quantity
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getQuantity() {
@@ -153,8 +153,8 @@ public Integer getQuantity() {
   }
 
   /**
-    * Set quantity
-  **/
+   * Set quantity
+   */
   @JsonProperty(JSON_PROPERTY_QUANTITY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setQuantity(Integer quantity) {
@@ -166,10 +166,10 @@ public Order quantity(Integer quantity) {
     return this;
   }
 
- /**
+  /**
    * Get shipDate
    * @return shipDate
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Date getShipDate() {
@@ -177,8 +177,8 @@ public Date getShipDate() {
   }
 
   /**
-    * Set shipDate
-  **/
+   * Set shipDate
+   */
   @JsonProperty(JSON_PROPERTY_SHIP_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setShipDate(Date shipDate) {
@@ -190,10 +190,10 @@ public Order shipDate(Date shipDate) {
     return this;
   }
 
- /**
+  /**
    * Order Status
    * @return status
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public StatusEnum getStatus() {
@@ -201,8 +201,8 @@ public StatusEnum getStatus() {
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStatus(StatusEnum status) {
@@ -214,10 +214,10 @@ public Order status(StatusEnum status) {
     return this;
   }
 
- /**
+  /**
    * Get complete
    * @return complete
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Boolean getComplete() {
@@ -225,8 +225,8 @@ public Boolean getComplete() {
   }
 
   /**
-    * Set complete
-  **/
+   * Set complete
+   */
   @JsonProperty(JSON_PROPERTY_COMPLETE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setComplete(Boolean complete) {
@@ -240,8 +240,8 @@ public Order complete(Boolean complete) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
index 48be5c7f12f2..881a1d6b5160 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Pet.java
@@ -35,7 +35,7 @@
 })
 /**
   * A pet for sale in the pet store
- **/
+  */
 
 public class Pet  {
   
@@ -93,15 +93,15 @@ public static StatusEnum fromValue(String value) {
 
   public static final String JSON_PROPERTY_STATUS = "status";
  /**
-   * pet status in the store
-  **/
+  * pet status in the store
+  */
   
   private StatusEnum status;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -109,8 +109,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -122,10 +122,10 @@ public Pet id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get category
    * @return category
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Category getCategory() {
@@ -133,8 +133,8 @@ public Category getCategory() {
   }
 
   /**
-    * Set category
-  **/
+   * Set category
+   */
   @JsonProperty(JSON_PROPERTY_CATEGORY)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setCategory(Category category) {
@@ -146,10 +146,10 @@ public Pet category(Category category) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public String getName() {
@@ -157,8 +157,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setName(String name) {
@@ -170,10 +170,10 @@ public Pet name(String name) {
     return this;
   }
 
- /**
+  /**
    * Get photoUrls
    * @return photoUrls
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public List<String> getPhotoUrls() {
@@ -181,8 +181,8 @@ public List<String> getPhotoUrls() {
   }
 
   /**
-    * Set photoUrls
-  **/
+   * Set photoUrls
+   */
   @JsonProperty(JSON_PROPERTY_PHOTO_URLS)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public void setPhotoUrls(List<String> photoUrls) {
@@ -202,10 +202,10 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
     return this;
   }
 
- /**
+  /**
    * Get tags
    * @return tags
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public List<Tag> getTags() {
@@ -213,8 +213,8 @@ public List<Tag> getTags() {
   }
 
   /**
-    * Set tags
-  **/
+   * Set tags
+   */
   @JsonProperty(JSON_PROPERTY_TAGS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setTags(List<Tag> tags) {
@@ -234,11 +234,11 @@ public Pet addTagsItem(Tag tagsItem) {
     return this;
   }
 
- /**
+  /**
    * pet status in the store
    * @return status
    * @deprecated
-  **/
+   **/
   @Deprecated
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
@@ -247,8 +247,8 @@ public StatusEnum getStatus() {
   }
 
   /**
-    * Set status
-  **/
+   * Set status
+   */
   @JsonProperty(JSON_PROPERTY_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setStatus(StatusEnum status) {
@@ -262,8 +262,8 @@ public Pet status(StatusEnum status) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Tag.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Tag.java
index fc166497373a..662d5fbfa9cc 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Tag.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/Tag.java
@@ -26,7 +26,7 @@
 })
 /**
   * A tag for a pet
- **/
+  */
 
 public class Tag  {
   
@@ -38,10 +38,10 @@ public class Tag  {
   
   private String name;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -49,8 +49,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -62,10 +62,10 @@ public Tag id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get name
    * @return name
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getName() {
@@ -73,8 +73,8 @@ public String getName() {
   }
 
   /**
-    * Set name
-  **/
+   * Set name
+   */
   @JsonProperty(JSON_PROPERTY_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setName(String name) {
@@ -88,8 +88,8 @@ public Tag name(String name) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/User.java b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/User.java
index f340936ab0ca..85f009328506 100644
--- a/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/User.java
+++ b/samples/server/petstore/java-microprofile/src/main/java/org/openapitools/server/model/User.java
@@ -32,7 +32,7 @@
 })
 /**
   * A User who is purchasing from the pet store
- **/
+  */
 
 public class User  {
   
@@ -66,15 +66,15 @@ public class User  {
 
   public static final String JSON_PROPERTY_USER_STATUS = "userStatus";
  /**
-   * User Status
-  **/
+  * User Status
+  */
   
   private Integer userStatus;
 
- /**
+  /**
    * Get id
    * @return id
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Long getId() {
@@ -82,8 +82,8 @@ public Long getId() {
   }
 
   /**
-    * Set id
-  **/
+   * Set id
+   */
   @JsonProperty(JSON_PROPERTY_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setId(Long id) {
@@ -95,10 +95,10 @@ public User id(Long id) {
     return this;
   }
 
- /**
+  /**
    * Get username
    * @return username
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getUsername() {
@@ -106,8 +106,8 @@ public String getUsername() {
   }
 
   /**
-    * Set username
-  **/
+   * Set username
+   */
   @JsonProperty(JSON_PROPERTY_USERNAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setUsername(String username) {
@@ -119,10 +119,10 @@ public User username(String username) {
     return this;
   }
 
- /**
+  /**
    * Get firstName
    * @return firstName
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getFirstName() {
@@ -130,8 +130,8 @@ public String getFirstName() {
   }
 
   /**
-    * Set firstName
-  **/
+   * Set firstName
+   */
   @JsonProperty(JSON_PROPERTY_FIRST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setFirstName(String firstName) {
@@ -143,10 +143,10 @@ public User firstName(String firstName) {
     return this;
   }
 
- /**
+  /**
    * Get lastName
    * @return lastName
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getLastName() {
@@ -154,8 +154,8 @@ public String getLastName() {
   }
 
   /**
-    * Set lastName
-  **/
+   * Set lastName
+   */
   @JsonProperty(JSON_PROPERTY_LAST_NAME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setLastName(String lastName) {
@@ -167,10 +167,10 @@ public User lastName(String lastName) {
     return this;
   }
 
- /**
+  /**
    * Get email
    * @return email
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getEmail() {
@@ -178,8 +178,8 @@ public String getEmail() {
   }
 
   /**
-    * Set email
-  **/
+   * Set email
+   */
   @JsonProperty(JSON_PROPERTY_EMAIL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setEmail(String email) {
@@ -191,10 +191,10 @@ public User email(String email) {
     return this;
   }
 
- /**
+  /**
    * Get password
    * @return password
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getPassword() {
@@ -202,8 +202,8 @@ public String getPassword() {
   }
 
   /**
-    * Set password
-  **/
+   * Set password
+   */
   @JsonProperty(JSON_PROPERTY_PASSWORD)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPassword(String password) {
@@ -215,10 +215,10 @@ public User password(String password) {
     return this;
   }
 
- /**
+  /**
    * Get phone
    * @return phone
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getPhone() {
@@ -226,8 +226,8 @@ public String getPhone() {
   }
 
   /**
-    * Set phone
-  **/
+   * Set phone
+   */
   @JsonProperty(JSON_PROPERTY_PHONE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setPhone(String phone) {
@@ -239,10 +239,10 @@ public User phone(String phone) {
     return this;
   }
 
- /**
+  /**
    * User Status
    * @return userStatus
-  **/
+   **/
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getUserStatus() {
@@ -250,8 +250,8 @@ public Integer getUserStatus() {
   }
 
   /**
-    * Set userStatus
-  **/
+   * Set userStatus
+   */
   @JsonProperty(JSON_PROPERTY_USER_STATUS)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public void setUserStatus(Integer userStatus) {
@@ -265,8 +265,8 @@ public User userStatus(Integer userStatus) {
 
 
   /**
-    * Create a string representation of this pojo.
-  **/
+   * Create a string representation of this pojo.
+   */
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
index d456aa0a571c..77a09d464d9f 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml
@@ -1650,10 +1650,11 @@ components:
         photoUrls:
           items:
             type: string
+            xml:
+              name: photoUrl
           type: array
           uniqueItems: true
           xml:
-            name: photoUrl
             wrapped: true
         tags:
           items:
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index ccf633751956..70ed8b093357 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 6881dd234e17..7a124362197e 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 295ce50f7d58..be06c451b7b8 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index caec6d926511..c73cda71e006 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -74,7 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_string")
@@ -102,7 +102,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_number")
@@ -130,7 +130,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_integer")
@@ -158,7 +158,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_boolean")
@@ -186,7 +186,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_integer")
@@ -214,7 +214,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_anytype")
@@ -242,7 +242,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_string")
@@ -270,7 +270,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_anytype")
@@ -290,7 +290,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_1")
@@ -310,7 +310,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_2")
@@ -330,7 +330,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 02be3686067d..3b43d0da3584 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 5be86fba0911..97d02674ec68 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index a47f4357de62..4fdc0b050153 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index ae794e96ff2c..9b045ffebb07 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
index c82a3d8a8aeb..818edc2cb5a6 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("color")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 0278df289037..a3e3f1b10250 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index a2ed8c168b39..7a8a52168934 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
index fb1a17cd7877..b556efec6550 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
@@ -50,7 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_of_string")
@@ -78,7 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_integer")
@@ -106,7 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java
index e499e9aa26a5..65fcc1ca36ec 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java
@@ -87,7 +87,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("kind")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
index e9804c9a1e6e..7408b8cb7aa5 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
@@ -41,7 +41,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("smallCamel")
@@ -61,7 +61,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("CapitalCamel")
@@ -81,7 +81,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("small_Snake")
@@ -101,7 +101,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("Capital_Snake")
@@ -121,7 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -141,7 +141,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java
index bf614bb89d66..e8c0d1795dd9 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java
@@ -55,7 +55,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
index ab4860b0fb3e..2c6491659974 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
@@ -44,7 +44,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -64,7 +64,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ChildWithNullable.java
index de66f6c719b6..46a462be8e3c 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -39,7 +39,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @Schema(name = "otherProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
index 9e27d3d33a4d..6126b788dede 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
@@ -32,7 +32,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("_class")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
index afd91d6c5fbd..21723cd0378f 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
@@ -31,7 +31,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("client")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index ad3a548f2ff2..226b605be001 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -66,7 +66,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array")
@@ -94,7 +94,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("nullable_required_array")
@@ -122,7 +122,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("required_array")
@@ -150,7 +150,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java
index 81f91c77bee9..c277d3de45c1 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java
@@ -47,7 +47,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("breed")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
index afdb86d0c6af..efa05bc32eab 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
@@ -108,7 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("just_symbol")
@@ -136,7 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
index b222585be9fe..0b0823361034 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
@@ -198,7 +198,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_string")
@@ -218,7 +218,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("enum_string_required")
@@ -238,7 +238,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_integer")
@@ -258,7 +258,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_number")
@@ -278,7 +278,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
index b3a80b466d72..ec96357bbb76 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
@@ -32,7 +32,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index c19c90547eab..0fafd2083e8b 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -38,7 +38,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("file")
@@ -66,7 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("files")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
index 69c619a4ff54..0c78c317222b 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
@@ -83,7 +83,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
@@ -105,7 +105,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int32")
@@ -125,7 +125,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int64")
@@ -147,7 +147,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number")
@@ -169,7 +169,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("float")
@@ -191,7 +191,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("double")
@@ -211,7 +211,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
@@ -231,7 +231,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("byte")
@@ -251,7 +251,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("binary")
@@ -271,7 +271,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
@@ -291,7 +291,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -311,7 +311,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -331,7 +331,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("password")
@@ -351,7 +351,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index e504791906c5..e2088c2e7782 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -35,7 +35,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -55,7 +55,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foo")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
index 36ae89dbc171..65991c277fb3 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
@@ -87,7 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_of_string")
@@ -115,7 +115,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_of_enum_string")
@@ -143,7 +143,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("direct_map")
@@ -171,7 +171,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 020d04b7411e..a371a767e67d 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -43,7 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -63,7 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -91,7 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
index 9ffa25ca597d..2a46d99bad50 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
@@ -36,7 +36,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
@@ -56,7 +56,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("class")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
index cbdfaeca7dc3..8e2e78236c71 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -37,7 +37,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -57,7 +57,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -77,7 +77,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
index 5bec1e4192a8..f77cc933f6d6 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
@@ -33,7 +33,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
index 92c63607830b..613a20b8a24a 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
@@ -34,7 +34,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("return")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
index 1309621e88fd..078e4b6cb883 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
@@ -49,7 +49,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -69,7 +69,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("snake_case")
@@ -89,7 +89,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property")
@@ -109,7 +109,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NullableMapProperty.java
index 0cb8288e4022..d31209ccafc4 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -45,7 +45,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @Schema(name = "languageValues", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
index 46b1d19305d9..d6ad5164f1c0 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
@@ -32,7 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
index 4c2cf39daf1f..9e452a29b1df 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
@@ -82,7 +82,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -102,7 +102,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -122,7 +122,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -142,7 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -162,7 +162,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -182,7 +182,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
index 5ddc334ca0e0..9fc1f16c5b49 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
@@ -36,7 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_number")
@@ -56,7 +56,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_string")
@@ -76,7 +76,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1749253b10ed..26366e74fb4d 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -82,7 +82,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -102,7 +102,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @Schema(name = "nullableProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
index 780b2ff19f42..f9990b4d4b95 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
@@ -102,7 +102,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -122,7 +122,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -142,7 +142,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -170,7 +170,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -220,7 +220,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -231,7 +231,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 83608394b3ac..d881cbb0a8b3 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -33,7 +33,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -53,7 +53,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("baz")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 5f604c887303..9f6c5494cc9a 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -37,7 +37,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("normalPropertyName")
@@ -57,7 +57,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -77,7 +77,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lower-case-property-dashes")
@@ -97,7 +97,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
index 03b736e43ffc..9397b3b4a00e 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -33,7 +33,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
index e51dc6e80b9b..50945536995a 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
@@ -33,7 +33,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
index c724cf1aa729..3155f598ad37 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -59,7 +59,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -79,7 +79,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -99,7 +99,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -119,7 +119,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -147,7 +147,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
index eef6062e39e2..202e1a07b43d 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -62,7 +62,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -82,7 +82,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -102,7 +102,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("float_item")
@@ -122,7 +122,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -142,7 +142,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -170,7 +170,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
index cf2938851e83..fa92088bda97 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
@@ -45,7 +45,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -85,7 +85,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -105,7 +105,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -125,7 +125,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -145,7 +145,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -165,7 +165,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -185,7 +185,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
index 24854aa662ab..8aa00e822f01 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
@@ -100,7 +100,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_string")
@@ -120,7 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_number")
@@ -140,7 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_integer")
@@ -160,7 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_boolean")
@@ -188,7 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("wrapped_array")
@@ -208,7 +208,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_string")
@@ -228,7 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_number")
@@ -248,7 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_integer")
@@ -268,7 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_boolean")
@@ -296,7 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_array")
@@ -324,7 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_wrapped_array")
@@ -344,7 +344,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_string")
@@ -364,7 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_number")
@@ -384,7 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_integer")
@@ -404,7 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_boolean")
@@ -432,7 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_array")
@@ -460,7 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_wrapped_array")
@@ -480,7 +480,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_string")
@@ -500,7 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_number")
@@ -520,7 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_integer")
@@ -540,7 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_boolean")
@@ -568,7 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_array")
@@ -596,7 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_wrapped_array")
@@ -616,7 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_string")
@@ -636,7 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_number")
@@ -656,7 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_integer")
@@ -676,7 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_boolean")
@@ -704,7 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_array")
@@ -732,7 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_wrapped_array")
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 9e8dbf419174..0f9a7f005e79 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
@@ -65,7 +65,7 @@ public ObjectWithUniqueItems addNullSetItem(String nullSetItem) {
   /**
    * Get nullSet
    * @return nullSet
-  */
+   */
   
   @Schema(name = "nullSet", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullSet")
@@ -93,7 +93,7 @@ public ObjectWithUniqueItems addNotNullSetItem(String notNullSetItem) {
   /**
    * Get notNullSet
    * @return notNullSet
-  */
+   */
   
   @Schema(name = "notNullSet", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("notNullSet")
@@ -122,7 +122,7 @@ public ObjectWithUniqueItems addNullListItem(String nullListItem) {
   /**
    * Get nullList
    * @return nullList
-  */
+   */
   
   @Schema(name = "nullList", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullList")
@@ -150,7 +150,7 @@ public ObjectWithUniqueItems addNotNullListItem(String notNullListItem) {
   /**
    * Get notNullList
    * @return notNullList
-  */
+   */
   
   @Schema(name = "notNullList", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("notNullList")
@@ -170,7 +170,7 @@ public ObjectWithUniqueItems notNullDateField(OffsetDateTime notNullDateField) {
   /**
    * Get notNullDateField
    * @return notNullDateField
-  */
+   */
   @Valid 
   @Schema(name = "notNullDateField", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("notNullDateField")
@@ -190,7 +190,7 @@ public ObjectWithUniqueItems nullDateField(OffsetDateTime nullDateField) {
   /**
    * Get nullDateField
    * @return nullDateField
-  */
+   */
   @Valid 
   @Schema(name = "nullDateField", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullDateField")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index c6b86a13183f..3f7dd977443c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 18bca6a150a5..9219cf31da89 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 172341b1a14a..ae152796e104 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 9feafbc4fa54..ee0a3915277c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -71,7 +71,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -99,7 +99,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -127,7 +127,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -155,7 +155,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -183,7 +183,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -211,7 +211,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -239,7 +239,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -267,7 +267,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -287,7 +287,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -307,7 +307,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -327,7 +327,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 4c121a136b9c..666447ef5747 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 2a0d43bbc316..56af5d96406f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 8cb8d0945f06..ae5efca21702 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 01576ff1e271..ec3bf3c63748 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
index 9a3b75c1fbf5..4deab5a8bd86 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 26aad067fe06..ef7aa874fd3f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 69f55c4ca83c..e2779fa9243f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
index 4cec9d32570a..b59c68eb0f2e 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -50,7 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -78,7 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -106,7 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
index 3db0a9e5d426..d550c5b6561f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
@@ -87,7 +87,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
index f1de8fbf0bca..0d36cab466d2 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
@@ -41,7 +41,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -61,7 +61,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -81,7 +81,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -101,7 +101,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -121,7 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -141,7 +141,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
index dd76e2123408..55f2512ef50b 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
@@ -55,7 +55,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
index 283337c1a1fd..abe08d5a8b0f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
@@ -44,7 +44,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -64,7 +64,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java
index f2e570624feb..b6d0493782e8 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -37,7 +37,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
index 06067d2a72d6..f5034c4a47cd 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
@@ -32,7 +32,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
index d98f5d316bc3..99ff374b17d3 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
@@ -31,7 +31,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 65e3b1aac470..f6b661db138b 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -64,7 +64,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -92,7 +92,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -120,7 +120,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -148,7 +148,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
index e86e34a12880..100866bb99cb 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
@@ -47,7 +47,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
index 631b548321af..3f770c79ab5f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -108,7 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -136,7 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
index 046cb8c9734f..163a3639d223 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
@@ -198,7 +198,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -218,7 +218,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -238,7 +238,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -258,7 +258,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -278,7 +278,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
index 1ddacd334aa7..38680ffb1dbf 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
@@ -32,7 +32,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index c09fb6e5c872..aaac9776c8d2 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -38,7 +38,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -66,7 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
index e57b5aa8cedc..2f10e8bf460a 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
@@ -83,7 +83,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -105,7 +105,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -125,7 +125,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -147,7 +147,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -169,7 +169,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -191,7 +191,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -211,7 +211,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -231,7 +231,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -251,7 +251,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -271,7 +271,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -291,7 +291,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -311,7 +311,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -331,7 +331,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -351,7 +351,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 48c27b4b6c3f..886c1e23cf88 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -35,7 +35,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -55,7 +55,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
index b1d12d629a83..92ba11de3930 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
@@ -87,7 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -115,7 +115,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -143,7 +143,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -171,7 +171,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 685a673e04d3..d9cf21185822 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -43,7 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -63,7 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -91,7 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
index b9ed322663ec..98cc8f7a09ba 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
@@ -36,7 +36,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -56,7 +56,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
index 44c948c82454..9d555c068856 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -37,7 +37,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -57,7 +57,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -77,7 +77,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
index ec67c9288876..8fbe42d5837b 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
@@ -33,7 +33,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
index 56c76c764915..9ef6b04fe544 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
@@ -34,7 +34,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
index 5fb686a02534..6e5af0c84321 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
@@ -49,7 +49,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -69,7 +69,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -89,7 +89,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -109,7 +109,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NullableMapProperty.java
index 818a5a3bb290..d37906140864 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -42,7 +42,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
index af1010cca45f..10c222a0f61f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
@@ -32,7 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
index cf8b6f3e7694..13a11bffcb15 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
@@ -82,7 +82,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -102,7 +102,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -122,7 +122,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -142,7 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -162,7 +162,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -182,7 +182,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
index 22aedc44154b..6a862cdf513c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
@@ -36,7 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -56,7 +56,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -76,7 +76,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java
index e6b998778c84..c0273b2358ee 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -79,7 +79,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -99,7 +99,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
index 1b4ba93f299b..a4b0607751d5 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
@@ -102,7 +102,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -122,7 +122,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -142,7 +142,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -170,7 +170,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -220,7 +220,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -231,7 +231,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 6929f394a517..05e3193fbbe7 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -33,7 +33,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -53,7 +53,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 8b54d058e64a..9367325bbb15 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -37,7 +37,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -57,7 +57,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -77,7 +77,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -97,7 +97,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
index d7b775f429b9..8f380775e6cb 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -33,7 +33,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
index 60ab1c2835d2..8bc99b46fac0 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
@@ -33,7 +33,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 26c4896310c6..4b15806ad3d2 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -59,7 +59,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -79,7 +79,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -99,7 +99,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -119,7 +119,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -147,7 +147,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
index 545d1f2bac7c..901591e12cb9 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -62,7 +62,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -82,7 +82,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -102,7 +102,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -122,7 +122,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -142,7 +142,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -170,7 +170,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
index f7e79942162b..0c9994e95af8 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
@@ -45,7 +45,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -85,7 +85,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -105,7 +105,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -125,7 +125,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -145,7 +145,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -165,7 +165,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -185,7 +185,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
index 0311ae1f4cfe..39bac753e338 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
@@ -100,7 +100,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -120,7 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -140,7 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -160,7 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -188,7 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -208,7 +208,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -228,7 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -248,7 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -268,7 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -296,7 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -324,7 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -344,7 +344,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -364,7 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -384,7 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -404,7 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -432,7 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -460,7 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -480,7 +480,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -500,7 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -520,7 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -540,7 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -568,7 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -596,7 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -616,7 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -636,7 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -656,7 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -676,7 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -704,7 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -732,7 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index cec9229e6af4..b6238d12175d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -75,7 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -103,7 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -131,7 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -159,7 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -187,7 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -215,7 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -243,7 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -271,7 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -291,7 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -311,7 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -331,7 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
index 518ea01bc0ba..81ad988fd02f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
@@ -59,7 +59,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -79,7 +79,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
index 134bb697ed98..52f7abb6acce 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
@@ -88,7 +88,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
index 3925a2c3075c..aa52134df04c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
@@ -56,7 +56,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java
index ae21492bb5ef..3c12366801e7 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -40,7 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index cc11ac3a2195..dff1ec861b8e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -67,7 +67,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -95,7 +95,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -123,7 +123,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -151,7 +151,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java
index 426ef18252a2..9df6f37d023f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -46,7 +46,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1358f00414af..c097da25f3b4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -83,7 +83,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -103,7 +103,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
index 6528c5b357b1..6089ea80e189 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
@@ -103,7 +103,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -123,7 +123,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -143,7 +143,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -171,7 +171,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -200,7 +200,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -221,7 +221,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -232,7 +232,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 97f1969d98ff..d51d35661c1b 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -38,7 +38,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -58,7 +58,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -78,7 +78,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -98,7 +98,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
index f7ddab482bc4..3102a21139e6 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
index a281394e588f..eaf55cab1079 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index cec9229e6af4..b6238d12175d 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -75,7 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -103,7 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -131,7 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -159,7 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -187,7 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -215,7 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -243,7 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -271,7 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -291,7 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -311,7 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -331,7 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
index 518ea01bc0ba..81ad988fd02f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
@@ -59,7 +59,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -79,7 +79,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
index 134bb697ed98..52f7abb6acce 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
@@ -88,7 +88,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
index 3925a2c3075c..aa52134df04c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
@@ -56,7 +56,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java
index ae21492bb5ef..3c12366801e7 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -40,7 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index cc11ac3a2195..dff1ec861b8e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -67,7 +67,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -95,7 +95,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -123,7 +123,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -151,7 +151,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java
index 426ef18252a2..9df6f37d023f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -46,7 +46,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1358f00414af..c097da25f3b4 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -83,7 +83,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -103,7 +103,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
index 6528c5b357b1..6089ea80e189 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
@@ -103,7 +103,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -123,7 +123,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -143,7 +143,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -171,7 +171,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -200,7 +200,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -221,7 +221,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -232,7 +232,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 97f1969d98ff..d51d35661c1b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -38,7 +38,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -58,7 +58,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -78,7 +78,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -98,7 +98,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index f7ddab482bc4..3102a21139e6 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index a281394e588f..eaf55cab1079 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java
index c15327f3b227..e69dcad7a2aa 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java
@@ -35,7 +35,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java
index 4cbbaf729fd1..beb8c406e91c 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -39,7 +39,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -59,7 +59,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -79,7 +79,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java
index bc7c066e59e5..59dbbb89f24d 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java
@@ -84,7 +84,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -104,7 +104,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -124,7 +124,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -144,7 +144,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -164,7 +164,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -184,7 +184,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
index 1902a984b405..bfd489d624cc 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
@@ -101,7 +101,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -121,7 +121,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -141,7 +141,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -169,7 +169,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -197,7 +197,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -218,7 +218,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -229,7 +229,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java
index 5887c9efe1ee..5452ab7e1af8 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java
@@ -35,7 +35,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -55,7 +55,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java
index 881ccb2a1e17..1d7b11886256 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java
@@ -47,7 +47,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -67,7 +67,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -87,7 +87,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -107,7 +107,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -127,7 +127,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -147,7 +147,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -167,7 +167,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -187,7 +187,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index a62950917aaa..808bbe42de93 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -33,8 +33,8 @@ public AdditionalPropertiesAnyType() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesAnyType(String name) {
       this.name = name;
   }
@@ -47,7 +47,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 363bcdd2b874..aaa73cc3b77a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -34,8 +34,8 @@ public AdditionalPropertiesArray() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesArray(String name) {
       this.name = name;
   }
@@ -48,7 +48,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index a4033ed37a01..f9e0a14bac1c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -33,8 +33,8 @@ public AdditionalPropertiesBoolean() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesBoolean(String name) {
       this.name = name;
   }
@@ -47,7 +47,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index ff87f88f95d9..c48f75302f1f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -64,8 +64,8 @@ public AdditionalPropertiesClass() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesClass(Map<String, String> mapString, Map<String, BigDecimal> mapNumber, Map<String, Integer> mapInteger, Map<String, Boolean> mapBoolean, Map<String, List<Integer>> mapArrayInteger, Map<String, List<Object>> mapArrayAnytype, Map<String, Map<String, String>> mapMapString, Map<String, Map<String, Object>> mapMapAnytype, Object anytype1, Object anytype2, Object anytype3) {
       this.mapString = mapString;
       this.mapNumber = mapNumber;
@@ -96,7 +96,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -124,7 +124,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -152,7 +152,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -180,7 +180,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -208,7 +208,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -236,7 +236,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -264,7 +264,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -292,7 +292,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -312,7 +312,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -332,7 +332,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -352,7 +352,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 7507e8ae7d2b..a2eb0894dd9a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -33,8 +33,8 @@ public AdditionalPropertiesInteger() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesInteger(String name) {
       this.name = name;
   }
@@ -47,7 +47,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index cd6dde642760..78f276af0ff3 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -34,8 +34,8 @@ public AdditionalPropertiesNumber() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesNumber(String name) {
       this.name = name;
   }
@@ -48,7 +48,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index dce80933a30f..b3c91679bf1b 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -34,8 +34,8 @@ public AdditionalPropertiesObject() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesObject(String name) {
       this.name = name;
   }
@@ -48,7 +48,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8c92fb08fd5f..4007358bf839 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -33,8 +33,8 @@ public AdditionalPropertiesString() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public AdditionalPropertiesString(String name) {
       this.name = name;
   }
@@ -47,7 +47,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
index 0af818762afe..7206c5f25f3f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
@@ -52,8 +52,8 @@ public Animal(String className) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Animal(String className, String color) {
       this.className = className;
       this.color = color;
@@ -67,7 +67,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -87,7 +87,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 1527825ffea2..1844fb1521e3 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -34,8 +34,8 @@ public ArrayOfArrayOfNumberOnly() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ArrayOfArrayOfNumberOnly(List<List<BigDecimal>> arrayArrayNumber) {
       this.arrayArrayNumber = arrayArrayNumber;
   }
@@ -56,7 +56,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 12f8755de1d2..b2426dfb88a6 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -34,8 +34,8 @@ public ArrayOfNumberOnly() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ArrayOfNumberOnly(List<BigDecimal> arrayNumber) {
       this.arrayNumber = arrayNumber;
   }
@@ -56,7 +56,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
index 1ba12e55e161..1dff8f35bacb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
@@ -40,8 +40,8 @@ public ArrayTest() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ArrayTest(List<String> arrayOfString, List<List<Long>> arrayArrayOfInteger, List<List<@Valid ReadOnlyFirst>> arrayArrayOfModel) {
       this.arrayOfString = arrayOfString;
       this.arrayArrayOfInteger = arrayArrayOfInteger;
@@ -64,7 +64,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -92,7 +92,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -120,7 +120,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
index bee79d5f60ec..6249bcace9ab 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
@@ -81,8 +81,8 @@ public BigCat(String className) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public BigCat(KindEnum kind, Boolean declawed, String className, String color) {
       super(declawed, className, color);
       this.kind = kind;
@@ -96,7 +96,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
index 392a270f474e..2808789526d3 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
@@ -39,8 +39,8 @@ public Capitalization() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Capitalization(String smallCamel, String capitalCamel, String smallSnake, String capitalSnake, String scAETHFlowPoints, String ATT_NAME) {
       this.smallCamel = smallCamel;
       this.capitalCamel = capitalCamel;
@@ -58,7 +58,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -78,7 +78,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -98,7 +98,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -118,7 +118,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -138,7 +138,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -158,7 +158,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
index 5a73c40ef3d7..a80ea4dbcae4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
@@ -49,8 +49,8 @@ public Cat(String className) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Cat(Boolean declawed, String className, String color) {
       super(className, color);
       this.declawed = declawed;
@@ -64,7 +64,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
index 25867a75d261..d3fecfb5c0bb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -38,8 +38,8 @@ public Category(String name) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Category(Long id, String name) {
       this.id = id;
       this.name = name;
@@ -53,7 +53,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -73,7 +73,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java
index 67c4716f2eef..01598f9e390e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -37,8 +37,8 @@ public ChildWithNullable() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ChildWithNullable(String otherProperty, TypeEnum type, String nullableProperty) {
       super(type, nullableProperty);
       this.otherProperty = otherProperty;
@@ -52,7 +52,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
index 8ba0f6ca1512..759eede2ac90 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
@@ -30,8 +30,8 @@ public ClassModel() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ClassModel(String propertyClass) {
       this.propertyClass = propertyClass;
   }
@@ -44,7 +44,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
index e7df9d9c28c9..b3a413edc7d2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
@@ -29,8 +29,8 @@ public Client() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Client(String client) {
       this.client = client;
   }
@@ -43,7 +43,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 95588e1ed81f..55566514cea1 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -52,8 +52,8 @@ public ContainerDefaultValue(List<String> nullableRequiredArray, List<String> re
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ContainerDefaultValue(List<String> nullableArray, List<String> nullableRequiredArray, List<String> requiredArray, List<String> nullableArrayWithDefault) {
       this.nullableArray = JsonNullable.of(nullableArray);
       this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray);
@@ -77,7 +77,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -105,7 +105,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -133,7 +133,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -161,7 +161,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
index 06929a4dcd81..691347bb65cd 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
@@ -41,8 +41,8 @@ public Dog(String className) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Dog(String breed, String className, String color) {
       super(className, color);
       this.breed = breed;
@@ -56,7 +56,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
index 2f0678d6c133..42017e2946cd 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
@@ -106,8 +106,8 @@ public EnumArrays() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public EnumArrays(JustSymbolEnum justSymbol, List<ArrayEnumEnum> arrayEnum) {
       this.justSymbol = justSymbol;
       this.arrayEnum = arrayEnum;
@@ -121,7 +121,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -149,7 +149,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
index 743174663f18..ca77777a5e08 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
@@ -192,8 +192,8 @@ public EnumTest(EnumStringRequiredEnum enumStringRequired) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public EnumTest(EnumStringEnum enumString, EnumStringRequiredEnum enumStringRequired, EnumIntegerEnum enumInteger, EnumNumberEnum enumNumber, OuterEnum outerEnum) {
       this.enumString = enumString;
       this.enumStringRequired = enumStringRequired;
@@ -210,7 +210,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -230,7 +230,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -250,7 +250,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -270,7 +270,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -290,7 +290,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
index 4cc601114ed4..e56a9f52839c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
@@ -30,8 +30,8 @@ public File() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public File(String sourceURI) {
       this.sourceURI = sourceURI;
   }
@@ -44,7 +44,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 4696ea4c8ec2..d26fade603d7 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -36,8 +36,8 @@ public FileSchemaTestClass() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public FileSchemaTestClass(File file, List<@Valid File> files) {
       this.file = file;
       this.files = files;
@@ -51,7 +51,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -79,7 +79,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
index 98e593d40a26..3da841cfbeea 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -75,8 +75,8 @@ public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String passwo
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public FormatTest(Integer integer, Integer int32, Long int64, BigDecimal number, Float _float, Double _double, String string, byte[] _byte, org.springframework.core.io.Resource binary, LocalDate date, OffsetDateTime dateTime, UUID uuid, String password, BigDecimal bigDecimal) {
       this.integer = integer;
       this.int32 = int32;
@@ -104,7 +104,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -126,7 +126,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -146,7 +146,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -168,7 +168,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -190,7 +190,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -212,7 +212,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -232,7 +232,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -252,7 +252,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -272,7 +272,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -292,7 +292,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -312,7 +312,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -332,7 +332,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -352,7 +352,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -372,7 +372,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 644947cf66ec..9e04d2b70e61 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -33,8 +33,8 @@ public HasOnlyReadOnly() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public HasOnlyReadOnly(String bar, String foo) {
       this.bar = bar;
       this.foo = foo;
@@ -48,7 +48,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -68,7 +68,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
index 132133c3a269..96722bbed1b5 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
@@ -77,8 +77,8 @@ public MapTest() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public MapTest(Map<String, Map<String, String>> mapMapOfString, Map<String, InnerEnum> mapOfEnumString, Map<String, Boolean> directMap, Map<String, Boolean> indirectMap) {
       this.mapMapOfString = mapMapOfString;
       this.mapOfEnumString = mapOfEnumString;
@@ -102,7 +102,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -130,7 +130,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -158,7 +158,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -186,7 +186,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 22af51bb46b8..16a111bd75fb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -41,8 +41,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public MixedPropertiesAndAdditionalPropertiesClass(UUID uuid, OffsetDateTime dateTime, Map<String, Animal> map) {
       this.uuid = uuid;
       this.dateTime = dateTime;
@@ -57,7 +57,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -77,7 +77,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -105,7 +105,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
index e119196f62d2..93e34e55919b 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
@@ -34,8 +34,8 @@ public Model200Response() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Model200Response(Integer name, String propertyClass) {
       this.name = name;
       this.propertyClass = propertyClass;
@@ -49,7 +49,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -69,7 +69,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
index 8430b03fe398..3fc0fc440c17 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -35,8 +35,8 @@ public ModelApiResponse() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelApiResponse(Integer code, String type, String message) {
       this.code = code;
       this.type = type;
@@ -51,7 +51,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -71,7 +71,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -91,7 +91,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
index 2039d9fd3925..cb1f4f73f7bf 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
@@ -31,8 +31,8 @@ public ModelList() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelList(String _123list) {
       this._123list = _123list;
   }
@@ -45,7 +45,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
index ecd60b68ae00..c73cfec969e7 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
@@ -32,8 +32,8 @@ public ModelReturn() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ModelReturn(Integer _return) {
       this._return = _return;
   }
@@ -46,7 +46,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
index a80f4ac791ed..99ed561ed2c6 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
@@ -43,8 +43,8 @@ public Name(Integer name) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Name(Integer name, Integer snakeCase, String property, Integer _123number) {
       this.name = name;
       this.snakeCase = snakeCase;
@@ -60,7 +60,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -80,7 +80,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -100,7 +100,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -120,7 +120,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java
index 996799027a34..7c71c5e74806 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -35,8 +35,8 @@ public NullableMapProperty() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public NullableMapProperty(Map<String, String> languageValues) {
       this.languageValues = JsonNullable.of(languageValues);
   }
@@ -57,7 +57,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
index 81594263ca45..55b0aea82f85 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
@@ -30,8 +30,8 @@ public NumberOnly() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public NumberOnly(BigDecimal justNumber) {
       this.justNumber = justNumber;
   }
@@ -44,7 +44,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
index 96588b3f7664..55f45c6b8f1c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
@@ -80,8 +80,8 @@ public Order() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Order(Long id, Long petId, Integer quantity, OffsetDateTime shipDate, StatusEnum status, Boolean complete) {
       this.id = id;
       this.petId = petId;
@@ -99,7 +99,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -119,7 +119,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -139,7 +139,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -159,7 +159,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -179,7 +179,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -199,7 +199,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
index 8e71cc573cc3..39d6da77a4e4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
@@ -34,8 +34,8 @@ public OuterComposite() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public OuterComposite(BigDecimal myNumber, String myString, Boolean myBoolean) {
       this.myNumber = myNumber;
       this.myString = myString;
@@ -50,7 +50,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -70,7 +70,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -90,7 +90,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
index 7b81d13e0045..eb5cece2cb9f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -80,8 +80,8 @@ public ParentWithNullable() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ParentWithNullable(TypeEnum type, String nullableProperty) {
       this.type = type;
       this.nullableProperty = JsonNullable.of(nullableProperty);
@@ -95,7 +95,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -115,7 +115,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index 327f677f72e6..55823cdd3fbb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -96,8 +96,8 @@ public Pet(String name, Set<String> photoUrls) {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Pet(Long id, Category category, String name, Set<String> photoUrls, List<@Valid Tag> tags, StatusEnum status) {
       this.id = id;
       this.category = category;
@@ -115,7 +115,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -135,7 +135,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -155,7 +155,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -183,7 +183,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -212,7 +212,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -233,7 +233,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -244,7 +244,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e3c3391fdc1..63c14ed55168 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -31,8 +31,8 @@ public ReadOnlyFirst() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ReadOnlyFirst(String bar, String baz) {
       this.bar = bar;
       this.baz = baz;
@@ -46,7 +46,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -66,7 +66,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 0d7b171ff0ec..bcd44939226a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -35,8 +35,8 @@ public ResponseObjectWithDifferentFieldNames() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public ResponseObjectWithDifferentFieldNames(String normalPropertyName, String UPPER_CASE_PROPERTY_SNAKE, String lowerCasePropertyDashes, String propertyNameWithSpaces) {
       this.normalPropertyName = normalPropertyName;
       this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
@@ -52,7 +52,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -72,7 +72,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -92,7 +92,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -112,7 +112,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
index 8f6a1761bde1..84eecdc4ed2e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -31,8 +31,8 @@ public SpecialModelName() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public SpecialModelName(Long $specialPropertyName) {
       this.$specialPropertyName = $specialPropertyName;
   }
@@ -45,7 +45,7 @@ public SpecialModelName(Long $specialPropertyName) {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
index 4d9c0ee19f1a..161d294cd5d5 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
@@ -31,8 +31,8 @@ public Tag() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public Tag(Long id, String name) {
       this.id = id;
       this.name = name;
@@ -46,7 +46,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 1ecc3983dcb8..67315c12e72c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
index d98bc3625d8a..298a128cbeb8 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
index af28f1b281f1..3d92b4082203 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
@@ -43,8 +43,8 @@ public User() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public User(Long id, String username, String firstName, String lastName, String email, String password, String phone, Integer userStatus) {
       this.id = id;
       this.username = username;
@@ -64,7 +64,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -84,7 +84,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -104,7 +104,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -124,7 +124,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -144,7 +144,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -164,7 +164,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -184,7 +184,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -204,7 +204,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
index 6fc966cbc8d6..45b758015ce9 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
@@ -98,8 +98,8 @@ public XmlItem() {
   }
 
   /**
-  * Constructor with all args parameters
-  */
+   * Constructor with all args parameters
+   */
   public XmlItem(String attributeString, BigDecimal attributeNumber, Integer attributeInteger, Boolean attributeBoolean, List<Integer> wrappedArray, String nameString, BigDecimal nameNumber, Integer nameInteger, Boolean nameBoolean, List<Integer> nameArray, List<Integer> nameWrappedArray, String prefixString, BigDecimal prefixNumber, Integer prefixInteger, Boolean prefixBoolean, List<Integer> prefixArray, List<Integer> prefixWrappedArray, String namespaceString, BigDecimal namespaceNumber, Integer namespaceInteger, Boolean namespaceBoolean, List<Integer> namespaceArray, List<Integer> namespaceWrappedArray, String prefixNsString, BigDecimal prefixNsNumber, Integer prefixNsInteger, Boolean prefixNsBoolean, List<Integer> prefixNsArray, List<Integer> prefixNsWrappedArray) {
       this.attributeString = attributeString;
       this.attributeNumber = attributeNumber;
@@ -140,7 +140,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -160,7 +160,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -180,7 +180,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -200,7 +200,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -228,7 +228,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -248,7 +248,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -268,7 +268,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -288,7 +288,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -308,7 +308,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -336,7 +336,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -364,7 +364,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -384,7 +384,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -404,7 +404,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -424,7 +424,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -444,7 +444,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -472,7 +472,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -500,7 +500,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -520,7 +520,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -540,7 +540,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -560,7 +560,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -580,7 +580,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -608,7 +608,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -636,7 +636,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -656,7 +656,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -676,7 +676,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -696,7 +696,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -716,7 +716,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -744,7 +744,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -772,7 +772,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java
index e72bc5e208ba..629a49c7b1b6 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java
@@ -32,7 +32,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -51,7 +51,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java
index b67c92199581..a688be430786 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -36,7 +36,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @JsonProperty("code")
   public Integer getCode() {
@@ -55,7 +55,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @JsonProperty("type")
   public String getType() {
@@ -74,7 +74,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @JsonProperty("message")
   public String getMessage() {
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java
index f42addfd951b..44836427f48b 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java
@@ -81,7 +81,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -100,7 +100,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @JsonProperty("petId")
   public Long getPetId() {
@@ -119,7 +119,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @JsonProperty("quantity")
   public Integer getQuantity() {
@@ -138,7 +138,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
@@ -157,7 +157,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @JsonProperty("status")
   public StatusEnum getStatus() {
@@ -176,7 +176,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @JsonProperty("complete")
   public Boolean getComplete() {
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
index 1a6771689c49..2cfd01b39027 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
@@ -98,7 +98,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -117,7 +117,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @JsonProperty("category")
   public Category getCategory() {
@@ -136,7 +136,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @JsonProperty("name")
   public String getName() {
@@ -163,7 +163,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
@@ -190,7 +190,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
@@ -210,7 +210,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @JsonProperty("status")
   @Deprecated
@@ -220,7 +220,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java
index c287674666ee..d754b75d6a16 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java
@@ -32,7 +32,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -51,7 +51,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @JsonProperty("name")
   public String getName() {
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java
index d6044eeb7855..e64e514efd16 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java
@@ -44,7 +44,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @JsonProperty("id")
   public Long getId() {
@@ -63,7 +63,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @JsonProperty("username")
   public String getUsername() {
@@ -82,7 +82,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @JsonProperty("firstName")
   public String getFirstName() {
@@ -101,7 +101,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @JsonProperty("lastName")
   public String getLastName() {
@@ -120,7 +120,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @JsonProperty("email")
   public String getEmail() {
@@ -139,7 +139,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @JsonProperty("password")
   public String getPassword() {
@@ -158,7 +158,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @JsonProperty("phone")
   public String getPhone() {
@@ -177,7 +177,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @JsonProperty("userStatus")
   public Integer getUserStatus() {
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index cec9229e6af4..b6238d12175d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -75,7 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -103,7 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -131,7 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -159,7 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -187,7 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -215,7 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -243,7 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -271,7 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -291,7 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -311,7 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -331,7 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
index 518ea01bc0ba..81ad988fd02f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
@@ -59,7 +59,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -79,7 +79,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
index 134bb697ed98..52f7abb6acce 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
@@ -88,7 +88,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
index 3925a2c3075c..aa52134df04c 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
@@ -56,7 +56,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java
index ae21492bb5ef..3c12366801e7 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -40,7 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index cc11ac3a2195..dff1ec861b8e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -67,7 +67,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -95,7 +95,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -123,7 +123,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -151,7 +151,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java
index 426ef18252a2..9df6f37d023f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -46,7 +46,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1358f00414af..c097da25f3b4 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -83,7 +83,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -103,7 +103,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index 6528c5b357b1..6089ea80e189 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -103,7 +103,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -123,7 +123,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -143,7 +143,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -171,7 +171,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -200,7 +200,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -221,7 +221,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -232,7 +232,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 97f1969d98ff..d51d35661c1b 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -38,7 +38,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -58,7 +58,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -78,7 +78,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -98,7 +98,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
index f7ddab482bc4..3102a21139e6 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
index a281394e588f..eaf55cab1079 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index cec9229e6af4..b6238d12175d 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -75,7 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -103,7 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -131,7 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -159,7 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -187,7 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -215,7 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -243,7 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -271,7 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -291,7 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -311,7 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -331,7 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java
index 518ea01bc0ba..81ad988fd02f 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Animal.java
@@ -59,7 +59,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -79,7 +79,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java
index 134bb697ed98..52f7abb6acce 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java
@@ -88,7 +88,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java
index 3925a2c3075c..aa52134df04c 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Cat.java
@@ -56,7 +56,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java
index ae21492bb5ef..3c12366801e7 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -40,7 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index cc11ac3a2195..dff1ec861b8e 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -67,7 +67,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -95,7 +95,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -123,7 +123,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -151,7 +151,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java
index 426ef18252a2..9df6f37d023f 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -46,7 +46,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1358f00414af..c097da25f3b4 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -83,7 +83,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -103,7 +103,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
index 6528c5b357b1..6089ea80e189 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Pet.java
@@ -103,7 +103,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -123,7 +123,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -143,7 +143,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -171,7 +171,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -200,7 +200,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -221,7 +221,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -232,7 +232,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 97f1969d98ff..d51d35661c1b 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -38,7 +38,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -58,7 +58,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -78,7 +78,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -98,7 +98,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java
index f7ddab482bc4..3102a21139e6 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java
index a281394e588f..eaf55cab1079 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index cec9229e6af4..b6238d12175d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -75,7 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -103,7 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -131,7 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -159,7 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -187,7 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -215,7 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -243,7 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -271,7 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -291,7 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -311,7 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -331,7 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
index 518ea01bc0ba..81ad988fd02f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
@@ -59,7 +59,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -79,7 +79,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
index 134bb697ed98..52f7abb6acce 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
@@ -88,7 +88,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
index 3925a2c3075c..aa52134df04c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
@@ -56,7 +56,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java
index ae21492bb5ef..3c12366801e7 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -40,7 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index cc11ac3a2195..dff1ec861b8e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -67,7 +67,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -95,7 +95,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -123,7 +123,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -151,7 +151,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java
index 426ef18252a2..9df6f37d023f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -46,7 +46,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
index 1358f00414af..c097da25f3b4 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -83,7 +83,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -103,7 +103,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
index 6528c5b357b1..6089ea80e189 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -103,7 +103,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -123,7 +123,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -143,7 +143,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -171,7 +171,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -200,7 +200,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -221,7 +221,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -232,7 +232,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 97f1969d98ff..d51d35661c1b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -38,7 +38,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -58,7 +58,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -78,7 +78,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -98,7 +98,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
index f7ddab482bc4..3102a21139e6 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
index a281394e588f..eaf55cab1079 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 7a139fcd6fa9..925d048e1c75 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -72,7 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -100,7 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -128,7 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -156,7 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -184,7 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -212,7 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -240,7 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -268,7 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -288,7 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -308,7 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -328,7 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
index a6b5c0712c1b..b7217bf2c87d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
index 4f5678d96f55..e3766d8c0c0a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
@@ -48,7 +48,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
index 940733a686a4..f1733c2dfc55 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
@@ -99,7 +99,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -119,7 +119,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -139,7 +139,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -167,7 +167,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -195,7 +195,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -215,7 +215,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index 05d6080374e4..315e2dc0995f 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index f5584666bf88..adff56ab1dfe 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 7a139fcd6fa9..925d048e1c75 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -72,7 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -100,7 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -128,7 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -156,7 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -184,7 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -212,7 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -240,7 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -268,7 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -288,7 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -308,7 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -328,7 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
index a6b5c0712c1b..b7217bf2c87d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java
index 4f5678d96f55..e3766d8c0c0a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java
@@ -48,7 +48,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
index 940733a686a4..f1733c2dfc55 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
@@ -99,7 +99,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -119,7 +119,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -139,7 +139,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -167,7 +167,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -195,7 +195,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -215,7 +215,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
index 05d6080374e4..315e2dc0995f 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
index f5584666bf88..adff56ab1dfe 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 7a139fcd6fa9..925d048e1c75 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -72,7 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -100,7 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -128,7 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -156,7 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -184,7 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -212,7 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -240,7 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -268,7 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -288,7 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -308,7 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -328,7 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
index a6b5c0712c1b..b7217bf2c87d 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java
index 4f5678d96f55..e3766d8c0c0a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java
@@ -48,7 +48,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
index 940733a686a4..f1733c2dfc55 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
@@ -99,7 +99,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -119,7 +119,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -139,7 +139,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -167,7 +167,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -195,7 +195,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -215,7 +215,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index 05d6080374e4..315e2dc0995f 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index f5584666bf88..adff56ab1dfe 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 3db821147eae..18d1a12907c4 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index bfa238fd9be7..1c525214117c 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 2ddf8df68a44..1d4c1ac0c11a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 7a139fcd6fa9..925d048e1c75 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -72,7 +72,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -100,7 +100,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -128,7 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -156,7 +156,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -184,7 +184,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -212,7 +212,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -240,7 +240,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -268,7 +268,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -288,7 +288,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -308,7 +308,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -328,7 +328,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 8d2f4829bd9b..6e5fc3b40002 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 73778c5bc0dc..1ade4b2f850d 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 78373da5714d..0bbde7dd2250 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8516945a40c2..8536c1e9b80a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
index a6b5c0712c1b..b7217bf2c87d 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 61abe8d063e8..ef93fc965d29 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 1c8b1a9a9f58..7d17438059ca 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
index 8c6e3a0d1857..33827ecf56c3 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
index 03577a92059c..9d9f16252488 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java
index 4f5678d96f55..e3766d8c0c0a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java
@@ -48,7 +48,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
index 7076b3e2d7ee..7c312f3d2222 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
index 4dc39fc5a2f0..4dec2df39dca 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
index 41a746347ccd..b05210647bd9 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java
index 0d72a06783b3..de979b60dba1 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
index 9d659cb8cbc1..d9ec319c8923 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
index 1dd03397ebc7..920be6f8d742 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
index f97360ca38e8..d4546e7139c5 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 0753839c126d..f777671acd8a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
index 539fa05ee5b1..83f6d7d99254 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index ad3d27b576d5..8d8568c28ef3 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
index 606d0902d9d7..d6d8de88bafa 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1582dd84bca..fd2c32d282ca 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
index 20e4cf5e0429..60ebd89e83d3 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
index c603340eb7fa..78d1f177a645 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
index dfeb4771b1f6..37baa88ef046 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
index bda94a6413f0..fedc40dbf208 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
index b0ccca86ec75..82d366abb5c0 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
index 5ce321818334..37eee1c6a3cb 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
index 183135fc9839..5d18b4e41f55 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
index 075bc1ee96f2..4cac67024473 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
index 940733a686a4..f1733c2dfc55 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
@@ -99,7 +99,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -119,7 +119,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -139,7 +139,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -167,7 +167,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -195,7 +195,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -215,7 +215,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 2e50c2b10d7e..9033fa9dffea 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
index 05d6080374e4..315e2dc0995f 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
index c4f6c2d9b89c..6b56ddcc0e7b 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
index f5584666bf88..adff56ab1dfe 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
index 677078863b5d..39115ee601e2 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
index 8254c146f3e5..0f913577bec5 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
index e261ba752de3..c9ba58e9babb 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java
index 9f92fccb0718..d95864d13f9b 100644
--- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Category.java
@@ -33,7 +33,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java
index cbdfaeca7dc3..8e2e78236c71 100644
--- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -37,7 +37,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -57,7 +57,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -77,7 +77,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java
index f034e3a1b27a..015b9f1259aa 100644
--- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Order.java
@@ -82,7 +82,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -102,7 +102,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -122,7 +122,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -142,7 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -162,7 +162,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -182,7 +182,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java
index da29f1b8aeb5..e795bdd55ba3 100644
--- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Pet.java
@@ -98,7 +98,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -118,7 +118,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -138,7 +138,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -166,7 +166,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -194,7 +194,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -214,7 +214,7 @@ public Pet status(StatusEnum status) {
   /**
    * pet status in the store
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java
index e51dc6e80b9b..50945536995a 100644
--- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/Tag.java
@@ -33,7 +33,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java
index cf2938851e83..fa92088bda97 100644
--- a/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-provide-args/src/main/java/org/openapitools/model/User.java
@@ -45,7 +45,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -85,7 +85,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -105,7 +105,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -125,7 +125,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -145,7 +145,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -165,7 +165,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -185,7 +185,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index dc378d3fe421..b099dfa79dfb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 2097d51d4569..75bc1a321aa2 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index ec69313d6586..90f08308d132 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index a53b960295d6..78e15b824555 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -75,7 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -103,7 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -131,7 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -159,7 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -187,7 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -215,7 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -243,7 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -271,7 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -291,7 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -311,7 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -331,7 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 841cc807b5fd..f463c43c8d5f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index a61782dde371..ee257b21e008 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index f47bfff2d725..12a818527571 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -37,7 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 805e351951cd..cfa25f75e34d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
index f4e610a9d40b..48e5f6e9a090 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
@@ -59,7 +59,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -79,7 +79,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index d1ccfb02d64c..d265d3b2937a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 9b2a007141d6..1f7752a075b9 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -45,7 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
index f7e0170cfa3e..de29f0c42304 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
@@ -51,7 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -79,7 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -107,7 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
index 0983cb9706f6..2c97f50294f7 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
@@ -88,7 +88,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
index d4ba9ad6f2f1..ccbe16887497 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
@@ -42,7 +42,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -62,7 +62,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -82,7 +82,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -102,7 +102,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -122,7 +122,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -142,7 +142,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
index df7b94bd5c06..e29ba0789175 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
@@ -56,7 +56,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
index dd4c7bd56b57..b5f659ddd2d6 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
@@ -45,7 +45,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java
index beea2b4f2acf..abd6bb41f628 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java
@@ -40,7 +40,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
index 3e5ae92f6d69..6e2db4f83d9b 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
@@ -33,7 +33,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
index 84472fa8a002..d87f0e485796 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
@@ -32,7 +32,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 3ea9a1ef0010..5716ddfa7f9b 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -67,7 +67,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -95,7 +95,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -123,7 +123,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -151,7 +151,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
index 22cccf848921..ed2c13cc2dfc 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
@@ -48,7 +48,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
index 1379b32fe114..b06595b64869 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
@@ -109,7 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -137,7 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
index a4aa9ad1e493..8480cdab9c6e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
@@ -199,7 +199,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
index b1c2874aa567..037b1d19a51b 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
@@ -33,7 +33,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index aaa8eb557a51..a6e078ee88cb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -39,7 +39,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -67,7 +67,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
index 8dffe7323954..4c2ecb1dfdcd 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
@@ -84,7 +84,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 6c170690f464..487452020ccc 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
index 27713cc941da..8d6503d7a72e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
@@ -88,7 +88,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -116,7 +116,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -144,7 +144,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -172,7 +172,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index f28fab4d616b..508de46d2adb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,7 +44,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -64,7 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -92,7 +92,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
index 3c47ee889643..5ad1aaab3b77 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
@@ -37,7 +37,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
index 5792f8ed571c..660581f110c6 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -38,7 +38,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
index c2ec158ddd41..8d8c6135d96a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
@@ -34,7 +34,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
index 133de3ccaa2b..cf56bb07e069 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
@@ -35,7 +35,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
index 26d45e6cc6d6..2bbad71b51cf 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
@@ -50,7 +50,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -70,7 +70,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -90,7 +90,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -110,7 +110,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java
index 9929ea702924..d90f022293e2 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java
@@ -46,7 +46,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
index 7763fc988e8d..8f2df8875274 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
@@ -33,7 +33,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
index 9ba1113d43e8..9ac0464dcb4a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
@@ -83,7 +83,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -103,7 +103,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -123,7 +123,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -143,7 +143,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -163,7 +163,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -183,7 +183,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
index c425cae4458c..6e4df70cd7a7 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
@@ -37,7 +37,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -57,7 +57,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -77,7 +77,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java
index 44440d260b02..97734f4d518e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java
@@ -83,7 +83,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -103,7 +103,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
index 1ae439ee149b..ab9ee06e6cd9 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
@@ -103,7 +103,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -123,7 +123,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -143,7 +143,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -171,7 +171,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -200,7 +200,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -221,7 +221,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -232,7 +232,7 @@ public Optional<StatusEnum> getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(Optional<StatusEnum> status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 5ee2cde127d6..90dab70e14f5 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -34,7 +34,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -54,7 +54,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
index 182e3b7b4b76..92a80d7d633f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -38,7 +38,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -58,7 +58,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -78,7 +78,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -98,7 +98,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
index 9f6b43f7a2af..3fb4b46d0afc 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -34,7 +34,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
index dea15625302d..1998bb01c23e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
@@ -34,7 +34,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -54,7 +54,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
index ee06405a4918..49f3058637ed 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -60,7 +60,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -80,7 +80,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -100,7 +100,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -120,7 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -148,7 +148,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
index a14a55401c7c..91301d6297f0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -63,7 +63,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -83,7 +83,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -103,7 +103,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -123,7 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -143,7 +143,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -171,7 +171,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
index 985c6fa14913..8f09a987aef4 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
@@ -46,7 +46,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -66,7 +66,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -86,7 +86,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -106,7 +106,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -126,7 +126,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -146,7 +146,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -166,7 +166,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -186,7 +186,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
index ba12c7e5c9e2..43eec94d6ad4 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
@@ -101,7 +101,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -121,7 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -141,7 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -161,7 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -189,7 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -209,7 +209,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -229,7 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -249,7 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -269,7 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -297,7 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -325,7 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -345,7 +345,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -365,7 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -385,7 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -405,7 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -433,7 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -461,7 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -481,7 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -501,7 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -521,7 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -541,7 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -569,7 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -597,7 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -617,7 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -637,7 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -657,7 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -677,7 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -705,7 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -733,7 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
index e34e795140e6..20adedf4e179 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesAnyType name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
index 60c394e892fc..f3c8dc29d31a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesArray name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
index 514ae38a48af..bad14a6053ea 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesBoolean name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
index 6284bd0159ce..1f5f1a2b71d0 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
@@ -74,7 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_string")
@@ -102,7 +102,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_number")
@@ -130,7 +130,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_integer")
@@ -158,7 +158,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_boolean")
@@ -186,7 +186,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_integer")
@@ -214,7 +214,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_array_anytype")
@@ -242,7 +242,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_string")
@@ -270,7 +270,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_anytype")
@@ -290,7 +290,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_1")
@@ -310,7 +310,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_2")
@@ -330,7 +330,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
index 7a6e9239a298..6fc9777b334d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesInteger name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
index fec175b406f9..9a75e880f5cf 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesNumber name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
index a8246d645914..839573087738 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
@@ -36,7 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
index 870221d3a183..5eed16c6dc6b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
@@ -35,7 +35,7 @@ public AdditionalPropertiesString name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
index 146af42bbca4..036d69215675 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
@@ -58,7 +58,7 @@ public Animal className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("className")
@@ -78,7 +78,7 @@ public Animal color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
index 200729c03472..6ea77633fc64 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
index 422af1e4b3a9..0af18a94ecd0 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
@@ -44,7 +44,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
index c1f12a760ae7..0eff09755404 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
@@ -50,7 +50,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_of_string")
@@ -78,7 +78,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_integer")
@@ -106,7 +106,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
index b98f82bc651b..8feefcd8dc22 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
@@ -87,7 +87,7 @@ public BigCat kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
index 19fcf7b932b0..826fc791ce34 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
@@ -41,7 +41,7 @@ public Capitalization smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("smallCamel")
@@ -61,7 +61,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("CapitalCamel")
@@ -81,7 +81,7 @@ public Capitalization smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("small_Snake")
@@ -101,7 +101,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("Capital_Snake")
@@ -121,7 +121,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -141,7 +141,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
index facc2d6cd56d..b605fc784294 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
@@ -55,7 +55,7 @@ public Cat declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
index 076fe28b5ee1..3b428aa92360 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
@@ -44,7 +44,7 @@ public Category id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -64,7 +64,7 @@ public Category name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java
index 5d52e2976f72..d8e7ee9fb87f 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java
@@ -39,7 +39,7 @@ public ChildWithNullable otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @Schema(name = "otherProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
index 23ac05940419..1b00f3a22fa4 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
@@ -32,7 +32,7 @@ public ClassModel propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
index eacf1b02ef9b..31633805baff 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
@@ -31,7 +31,7 @@ public Client client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java
index 024d098f1673..0e0c71f92551 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java
@@ -66,7 +66,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array")
@@ -94,7 +94,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("nullable_required_array")
@@ -122,7 +122,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("required_array")
@@ -150,7 +150,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
index e695ead66be8..39fb3c138e2d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
@@ -47,7 +47,7 @@ public Dog breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
index 3ebd84e90219..9c412ac8635c 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
@@ -108,7 +108,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("just_symbol")
@@ -136,7 +136,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
index 21a12688ff03..3f74eca23398 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
@@ -198,7 +198,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_string")
@@ -218,7 +218,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("enum_string_required")
@@ -238,7 +238,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_integer")
@@ -258,7 +258,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("enum_number")
@@ -278,7 +278,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
index 09f1c5046b24..22991ac0eeed 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
@@ -32,7 +32,7 @@ public File sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
index 68126cfc5b42..ef5a8000757f 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
@@ -38,7 +38,7 @@ public FileSchemaTestClass file(File file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("file")
@@ -66,7 +66,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
index 475fd20a8c4a..3fc564f82ec8 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
@@ -83,7 +83,7 @@ public FormatTest integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
@@ -105,7 +105,7 @@ public FormatTest int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int32")
@@ -125,7 +125,7 @@ public FormatTest int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("int64")
@@ -147,7 +147,7 @@ public FormatTest number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number")
@@ -169,7 +169,7 @@ public FormatTest _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("float")
@@ -191,7 +191,7 @@ public FormatTest _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("double")
@@ -211,7 +211,7 @@ public FormatTest string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
@@ -231,7 +231,7 @@ public FormatTest _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("byte")
@@ -251,7 +251,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("binary")
@@ -271,7 +271,7 @@ public FormatTest date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
@@ -291,7 +291,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -311,7 +311,7 @@ public FormatTest uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -331,7 +331,7 @@ public FormatTest password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("password")
@@ -351,7 +351,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
index 64b95f630d9d..be184c75181f 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
@@ -35,7 +35,7 @@ public HasOnlyReadOnly bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -55,7 +55,7 @@ public HasOnlyReadOnly foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
index 916b8221cff1..bb8e6cb632b1 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
@@ -87,7 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_map_of_string")
@@ -115,7 +115,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map_of_enum_string")
@@ -143,7 +143,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("direct_map")
@@ -171,7 +171,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
index fb3eb924e937..cc282a3a4b67 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -43,7 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
@@ -63,7 +63,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
@@ -91,7 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
index fe7aae944ea3..ea8b88815c71 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
@@ -36,7 +36,7 @@ public Model200Response name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
@@ -56,7 +56,7 @@ public Model200Response propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
index 1651a0a8acd7..5e96065651d4 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
@@ -37,7 +37,7 @@ public ModelApiResponse code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("code")
@@ -57,7 +57,7 @@ public ModelApiResponse type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -77,7 +77,7 @@ public ModelApiResponse message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
index 0c369c17f517..3b6033a4a164 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
@@ -33,7 +33,7 @@ public ModelList _123list(String _123list) {
   /**
    * Get _123list
    * @return _123list
-  */
+   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
index a85c5799ddb0..e1e8f0a0631f 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
@@ -34,7 +34,7 @@ public ModelReturn _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
index 4edf6aca5b84..90c847192882 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
@@ -49,7 +49,7 @@ public Name name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -69,7 +69,7 @@ public Name snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("snake_case")
@@ -89,7 +89,7 @@ public Name property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property")
@@ -109,7 +109,7 @@ public Name _123number(Integer _123number) {
   /**
    * Get _123number
    * @return _123number
-  */
+   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java
index 8a638731148a..245bafcab2b7 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java
@@ -45,7 +45,7 @@ public NullableMapProperty putLanguageValuesItem(String key, String languageValu
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @Schema(name = "languageValues", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
index f7230082732c..d69d125101e8 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
@@ -32,7 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
index 633753b4ce0f..4963c95bcc75 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
@@ -82,7 +82,7 @@ public Order id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -102,7 +102,7 @@ public Order petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("petId")
@@ -122,7 +122,7 @@ public Order quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("quantity")
@@ -142,7 +142,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("shipDate")
@@ -162,7 +162,7 @@ public Order status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -182,7 +182,7 @@ public Order complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
index 8b9639e64bd8..06ddfad8e20e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
@@ -36,7 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_number")
@@ -56,7 +56,7 @@ public OuterComposite myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_string")
@@ -76,7 +76,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java
index d053a7c03418..4130e21af4ce 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java
@@ -82,7 +82,7 @@ public ParentWithNullable type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("type")
@@ -102,7 +102,7 @@ public ParentWithNullable nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @Schema(name = "nullableProperty", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
index eac0bcd38b47..0526a3dc5e90 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
@@ -102,7 +102,7 @@ public Pet id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -122,7 +122,7 @@ public Pet category(Category category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("category")
@@ -142,7 +142,7 @@ public Pet name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("name")
@@ -170,7 +170,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("photoUrls")
@@ -199,7 +199,7 @@ public Pet addTagsItem(Tag tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("tags")
@@ -220,7 +220,7 @@ public Pet status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @Schema(name = "status", description = "pet status in the store", deprecated = true, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("status")
@@ -231,7 +231,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
index a8d4e4c8f323..fc8ca900de2b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
@@ -33,7 +33,7 @@ public ReadOnlyFirst bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("bar")
@@ -53,7 +53,7 @@ public ReadOnlyFirst baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java
index 0c039b259bbd..401abc1458ca 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java
@@ -37,7 +37,7 @@ public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPro
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("normalPropertyName")
@@ -57,7 +57,7 @@ public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UP
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -77,7 +77,7 @@ public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowe
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lower-case-property-dashes")
@@ -97,7 +97,7 @@ public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String prope
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
index 969ce8ff2b77..e136b5ae6595 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
@@ -33,7 +33,7 @@ public class SpecialModelName {
   /**
    * Get $specialPropertyName
    * @return $specialPropertyName
-  */
+   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
index 20224c532fb5..cfd8cbd70efe 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
@@ -33,7 +33,7 @@ public Tag id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -53,7 +53,7 @@ public Tag name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
index 7c8453ec51c9..2a97914e414c 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
@@ -59,7 +59,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -79,7 +79,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -99,7 +99,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -119,7 +119,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -147,7 +147,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
index 9742ce14682a..7acd99b96096 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
@@ -62,7 +62,7 @@ public TypeHolderExample stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("string_item")
@@ -82,7 +82,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("number_item")
@@ -102,7 +102,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("float_item")
@@ -122,7 +122,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("integer_item")
@@ -142,7 +142,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("bool_item")
@@ -170,7 +170,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
index 1acdf015254f..3263d2c4ef1b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
@@ -45,7 +45,7 @@ public User id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("id")
@@ -65,7 +65,7 @@ public User username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("username")
@@ -85,7 +85,7 @@ public User firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("firstName")
@@ -105,7 +105,7 @@ public User lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("lastName")
@@ -125,7 +125,7 @@ public User email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("email")
@@ -145,7 +145,7 @@ public User password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("password")
@@ -165,7 +165,7 @@ public User phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("phone")
@@ -185,7 +185,7 @@ public User userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
index 3fa364e0a458..99edb8648e74 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
@@ -100,7 +100,7 @@ public XmlItem attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_string")
@@ -120,7 +120,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_number")
@@ -140,7 +140,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_integer")
@@ -160,7 +160,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("attribute_boolean")
@@ -188,7 +188,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("wrapped_array")
@@ -208,7 +208,7 @@ public XmlItem nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_string")
@@ -228,7 +228,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_number")
@@ -248,7 +248,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_integer")
@@ -268,7 +268,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_boolean")
@@ -296,7 +296,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_array")
@@ -324,7 +324,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("name_wrapped_array")
@@ -344,7 +344,7 @@ public XmlItem prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_string")
@@ -364,7 +364,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_number")
@@ -384,7 +384,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_integer")
@@ -404,7 +404,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_boolean")
@@ -432,7 +432,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_array")
@@ -460,7 +460,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_wrapped_array")
@@ -480,7 +480,7 @@ public XmlItem namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_string")
@@ -500,7 +500,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_number")
@@ -520,7 +520,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_integer")
@@ -540,7 +540,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_boolean")
@@ -568,7 +568,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_array")
@@ -596,7 +596,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("namespace_wrapped_array")
@@ -616,7 +616,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_string")
@@ -636,7 +636,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_number")
@@ -656,7 +656,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_integer")
@@ -676,7 +676,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_boolean")
@@ -704,7 +704,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_array")
@@ -732,7 +732,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("prefix_ns_wrapped_array")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
index 30b02140e51c..4f49ad30ae75 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
@@ -38,7 +38,7 @@ public AdditionalPropertiesAnyTypeDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
index 7824541755cc..ea716170484c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
@@ -39,7 +39,7 @@ public AdditionalPropertiesArrayDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
index 360d1a15917a..ebb783cd9bbb 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
@@ -38,7 +38,7 @@ public AdditionalPropertiesBooleanDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
index a22e27a0d045..c308861a5d5a 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
@@ -77,7 +77,7 @@ public AdditionalPropertiesClassDto putMapStringItem(String key, String mapStrin
   /**
    * Get mapString
    * @return mapString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_string")
@@ -105,7 +105,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN
   /**
    * Get mapNumber
    * @return mapNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_number")
@@ -133,7 +133,7 @@ public AdditionalPropertiesClassDto putMapIntegerItem(String key, Integer mapInt
   /**
    * Get mapInteger
    * @return mapInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_integer")
@@ -161,7 +161,7 @@ public AdditionalPropertiesClassDto putMapBooleanItem(String key, Boolean mapBoo
   /**
    * Get mapBoolean
    * @return mapBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_boolean")
@@ -189,7 +189,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List<Inte
   /**
    * Get mapArrayInteger
    * @return mapArrayInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_integer")
@@ -217,7 +217,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List<Obje
   /**
    * Get mapArrayAnytype
    * @return mapArrayAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_array_anytype")
@@ -245,7 +245,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map<String,
   /**
    * Get mapMapString
    * @return mapMapString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_string")
@@ -273,7 +273,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map<String,
   /**
    * Get mapMapAnytype
    * @return mapMapAnytype
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_anytype")
@@ -293,7 +293,7 @@ public AdditionalPropertiesClassDto anytype1(Object anytype1) {
   /**
    * Get anytype1
    * @return anytype1
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_1")
@@ -313,7 +313,7 @@ public AdditionalPropertiesClassDto anytype2(Object anytype2) {
   /**
    * Get anytype2
    * @return anytype2
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_2")
@@ -333,7 +333,7 @@ public AdditionalPropertiesClassDto anytype3(Object anytype3) {
   /**
    * Get anytype3
    * @return anytype3
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("anytype_3")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
index 6fd7f4d8161a..68538d47f196 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
@@ -38,7 +38,7 @@ public AdditionalPropertiesIntegerDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
index 15ce97f4de40..51adab20c2f0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
@@ -39,7 +39,7 @@ public AdditionalPropertiesNumberDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
index fbe004bc2172..21086b90138b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
@@ -39,7 +39,7 @@ public AdditionalPropertiesObjectDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
index 48ca6d800257..df5df623dc78 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
@@ -38,7 +38,7 @@ public AdditionalPropertiesStringDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java
index 277c7171edca..648183fec115 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java
@@ -60,7 +60,7 @@ public AnimalDto className(String className) {
   /**
    * Get className
    * @return className
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("className")
@@ -80,7 +80,7 @@ public AnimalDto color(String color) {
   /**
    * Get color
    * @return color
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("color")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java
index 501a5e4189cb..4b65aa93c459 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java
@@ -38,7 +38,7 @@ public ApiResponseDto code(Integer code) {
   /**
    * Get code
    * @return code
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("code")
@@ -58,7 +58,7 @@ public ApiResponseDto type(String type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -78,7 +78,7 @@ public ApiResponseDto message(String message) {
   /**
    * Get message
    * @return message
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("message")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
index 02223af69eb5..d3147f8cdd1d 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
@@ -47,7 +47,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List<BigDecimal> arra
   /**
    * Get arrayArrayNumber
    * @return arrayArrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayArrayNumber")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
index 870b3e960a27..9eade3bbdb3d 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
@@ -47,7 +47,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) {
   /**
    * Get arrayNumber
    * @return arrayNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("ArrayNumber")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java
index bdfd53d6f737..a04d3d5a1e97 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java
@@ -53,7 +53,7 @@ public ArrayTestDto addArrayOfStringItem(String arrayOfStringItem) {
   /**
    * Get arrayOfString
    * @return arrayOfString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_of_string")
@@ -81,7 +81,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerIte
   /**
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_integer")
@@ -109,7 +109,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array
   /**
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("array_array_of_model")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java
index 62e4b9219663..3e7cb784302c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java
@@ -90,7 +90,7 @@ public BigCatDto kind(KindEnum kind) {
   /**
    * Get kind
    * @return kind
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("kind")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java
index b0d865de9d06..4ef288d786af 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java
@@ -44,7 +44,7 @@ public CapitalizationDto smallCamel(String smallCamel) {
   /**
    * Get smallCamel
    * @return smallCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("smallCamel")
@@ -64,7 +64,7 @@ public CapitalizationDto capitalCamel(String capitalCamel) {
   /**
    * Get capitalCamel
    * @return capitalCamel
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("CapitalCamel")
@@ -84,7 +84,7 @@ public CapitalizationDto smallSnake(String smallSnake) {
   /**
    * Get smallSnake
    * @return smallSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("small_Snake")
@@ -104,7 +104,7 @@ public CapitalizationDto capitalSnake(String capitalSnake) {
   /**
    * Get capitalSnake
    * @return capitalSnake
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("Capital_Snake")
@@ -124,7 +124,7 @@ public CapitalizationDto scAETHFlowPoints(String scAETHFlowPoints) {
   /**
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("SCA_ETH_Flow_Points")
@@ -144,7 +144,7 @@ public CapitalizationDto ATT_NAME(String ATT_NAME) {
   /**
    * Name of the pet 
    * @return ATT_NAME
-  */
+   */
   
   @ApiModelProperty(value = "Name of the pet ")
   @JsonProperty("ATT_NAME")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java
index ec9afcbe80df..9e8349a7f2c0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java
@@ -57,7 +57,7 @@ public CatDto declawed(Boolean declawed) {
   /**
    * Get declawed
    * @return declawed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("declawed")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java
index 4ff104f4817e..06fd99219303 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java
@@ -47,7 +47,7 @@ public CategoryDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -67,7 +67,7 @@ public CategoryDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java
index b5f6371f89b9..c5634c76fbde 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java
@@ -42,7 +42,7 @@ public ChildWithNullableDto otherProperty(String otherProperty) {
   /**
    * Get otherProperty
    * @return otherProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("otherProperty")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java
index 85f8ff2fc794..3a9ccef2f81f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java
@@ -35,7 +35,7 @@ public ClassModelDto propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("_class")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java
index 288c046aa3d6..8c7790bb8667 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java
@@ -34,7 +34,7 @@ public ClientDto client(String client) {
   /**
    * Get client
    * @return client
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("client")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
index 0d6eecce8690..f7f6dc073818 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
@@ -69,7 +69,7 @@ public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) {
   /**
    * Get nullableArray
    * @return nullableArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array")
@@ -97,7 +97,7 @@ public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequ
   /**
    * Get nullableRequiredArray
    * @return nullableRequiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("nullable_required_array")
@@ -125,7 +125,7 @@ public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) {
   /**
    * Get requiredArray
    * @return requiredArray
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("required_array")
@@ -153,7 +153,7 @@ public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableA
   /**
    * Get nullableArrayWithDefault
    * @return nullableArrayWithDefault
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullable_array_with_default")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java
index f2813e7d5822..092e98b17fe9 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java
@@ -50,7 +50,7 @@ public DogDto breed(String breed) {
   /**
    * Get breed
    * @return breed
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("breed")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java
index 4c59fd93ee51..678350cd3f88 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java
@@ -111,7 +111,7 @@ public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) {
   /**
    * Get justSymbol
    * @return justSymbol
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("just_symbol")
@@ -139,7 +139,7 @@ public EnumArraysDto addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   /**
    * Get arrayEnum
    * @return arrayEnum
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("array_enum")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java
index 1c8698736687..a1c6cdbe0f96 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java
@@ -199,7 +199,7 @@ public EnumTestDto enumString(EnumStringEnum enumString) {
   /**
    * Get enumString
    * @return enumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_string")
@@ -219,7 +219,7 @@ public EnumTestDto enumStringRequired(EnumStringRequiredEnum enumStringRequired)
   /**
    * Get enumStringRequired
    * @return enumStringRequired
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("enum_string_required")
@@ -239,7 +239,7 @@ public EnumTestDto enumInteger(EnumIntegerEnum enumInteger) {
   /**
    * Get enumInteger
    * @return enumInteger
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_integer")
@@ -259,7 +259,7 @@ public EnumTestDto enumNumber(EnumNumberEnum enumNumber) {
   /**
    * Get enumNumber
    * @return enumNumber
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("enum_number")
@@ -279,7 +279,7 @@ public EnumTestDto outerEnum(OuterEnumDto outerEnum) {
   /**
    * Get outerEnum
    * @return outerEnum
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("outerEnum")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java
index 7620236c6035..5b6f73dddd70 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java
@@ -35,7 +35,7 @@ public FileDto sourceURI(String sourceURI) {
   /**
    * Test capitalization
    * @return sourceURI
-  */
+   */
   
   @ApiModelProperty(value = "Test capitalization")
   @JsonProperty("sourceURI")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
index 752faf5f4fc3..ef4436979948 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
@@ -41,7 +41,7 @@ public FileSchemaTestClassDto file(FileDto file) {
   /**
    * Get file
    * @return file
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("file")
@@ -69,7 +69,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) {
   /**
    * Get files
    * @return files
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("files")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java
index 1fed1b3f6d4a..23309cab974e 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java
@@ -84,7 +84,7 @@ public FormatTestDto integer(Integer integer) {
    * minimum: 10
    * maximum: 100
    * @return integer
-  */
+   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
@@ -106,7 +106,7 @@ public FormatTestDto int32(Integer int32) {
    * minimum: 20
    * maximum: 200
    * @return int32
-  */
+   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
   @JsonProperty("int32")
@@ -126,7 +126,7 @@ public FormatTestDto int64(Long int64) {
   /**
    * Get int64
    * @return int64
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("int64")
@@ -148,7 +148,7 @@ public FormatTestDto number(BigDecimal number) {
    * minimum: 32.1
    * maximum: 543.2
    * @return number
-  */
+   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number")
@@ -170,7 +170,7 @@ public FormatTestDto _float(Float _float) {
    * minimum: 54.3
    * maximum: 987.6
    * @return _float
-  */
+   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
   @JsonProperty("float")
@@ -192,7 +192,7 @@ public FormatTestDto _double(Double _double) {
    * minimum: 67.8
    * maximum: 123.4
    * @return _double
-  */
+   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
   @JsonProperty("double")
@@ -212,7 +212,7 @@ public FormatTestDto string(String string) {
   /**
    * Get string
    * @return string
-  */
+   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
@@ -232,7 +232,7 @@ public FormatTestDto _byte(byte[] _byte) {
   /**
    * Get _byte
    * @return _byte
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("byte")
@@ -252,7 +252,7 @@ public FormatTestDto binary(org.springframework.core.io.Resource binary) {
   /**
    * Get binary
    * @return binary
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("binary")
@@ -272,7 +272,7 @@ public FormatTestDto date(LocalDate date) {
   /**
    * Get date
    * @return date
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
@@ -292,7 +292,7 @@ public FormatTestDto dateTime(OffsetDateTime dateTime) {
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -312,7 +312,7 @@ public FormatTestDto uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
@@ -332,7 +332,7 @@ public FormatTestDto password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("password")
@@ -352,7 +352,7 @@ public FormatTestDto bigDecimal(BigDecimal bigDecimal) {
   /**
    * Get bigDecimal
    * @return bigDecimal
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
index 8e8a2efe9895..ac51fd11836b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
@@ -36,7 +36,7 @@ public HasOnlyReadOnlyDto bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public HasOnlyReadOnlyDto foo(String foo) {
   /**
    * Get foo
    * @return foo
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("foo")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java
index f2dbade9f3ec..d1d3fe2d861c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java
@@ -34,7 +34,7 @@ public ListDto _123List(String _123List) {
   /**
    * Get _123List
    * @return _123List
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("123-list")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java
index 127c62a29b63..6c98296627d7 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java
@@ -90,7 +90,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map<String, String> mapMapOf
   /**
    * Get mapMapOfString
    * @return mapMapOfString
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map_map_of_string")
@@ -118,7 +118,7 @@ public MapTestDto putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringIt
   /**
    * Get mapOfEnumString
    * @return mapOfEnumString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("map_of_enum_string")
@@ -146,7 +146,7 @@ public MapTestDto putDirectMapItem(String key, Boolean directMapItem) {
   /**
    * Get directMap
    * @return directMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("direct_map")
@@ -174,7 +174,7 @@ public MapTestDto putIndirectMapItem(String key, Boolean indirectMapItem) {
   /**
    * Get indirectMap
    * @return indirectMap
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("indirect_map")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
index f561fb2ee277..e53545f57dc8 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
@@ -46,7 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
   /**
    * Get uuid
    * @return uuid
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
@@ -66,7 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime da
   /**
    * Get dateTime
    * @return dateTime
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
@@ -94,7 +94,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani
   /**
    * Get map
    * @return map
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java
index 2c49c9314882..435cc8aa1d3f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java
@@ -37,7 +37,7 @@ public Model200ResponseDto name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
@@ -57,7 +57,7 @@ public Model200ResponseDto propertyClass(String propertyClass) {
   /**
    * Get propertyClass
    * @return propertyClass
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("class")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java
index 37cce23a30bf..6eec93b07940 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java
@@ -52,7 +52,7 @@ public NameDto name(Integer name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("name")
@@ -72,7 +72,7 @@ public NameDto snakeCase(Integer snakeCase) {
   /**
    * Get snakeCase
    * @return snakeCase
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("snake_case")
@@ -92,7 +92,7 @@ public NameDto property(String property) {
   /**
    * Get property
    * @return property
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property")
@@ -112,7 +112,7 @@ public NameDto _123Number(Integer _123Number) {
   /**
    * Get _123Number
    * @return _123Number
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("123Number")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java
index d915159c3c4a..0799027a9194 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java
@@ -48,7 +48,7 @@ public NullableMapPropertyDto putLanguageValuesItem(String key, String languageV
   /**
    * Get languageValues
    * @return languageValues
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("languageValues")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java
index 3b0128ab0bd8..2c293d9359a8 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java
@@ -35,7 +35,7 @@ public NumberOnlyDto justNumber(BigDecimal justNumber) {
   /**
    * Get justNumber
    * @return justNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("JustNumber")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java
index c1beaed3e34d..8c16893e5ab5 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java
@@ -85,7 +85,7 @@ public OrderDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -105,7 +105,7 @@ public OrderDto petId(Long petId) {
   /**
    * Get petId
    * @return petId
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("petId")
@@ -125,7 +125,7 @@ public OrderDto quantity(Integer quantity) {
   /**
    * Get quantity
    * @return quantity
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("quantity")
@@ -145,7 +145,7 @@ public OrderDto shipDate(OffsetDateTime shipDate) {
   /**
    * Get shipDate
    * @return shipDate
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("shipDate")
@@ -165,7 +165,7 @@ public OrderDto status(StatusEnum status) {
   /**
    * Order Status
    * @return status
-  */
+   */
   
   @ApiModelProperty(value = "Order Status")
   @JsonProperty("status")
@@ -185,7 +185,7 @@ public OrderDto complete(Boolean complete) {
   /**
    * Get complete
    * @return complete
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("complete")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java
index 1343cefbea11..14ae28c46c11 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java
@@ -39,7 +39,7 @@ public OuterCompositeDto myNumber(BigDecimal myNumber) {
   /**
    * Get myNumber
    * @return myNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("my_number")
@@ -59,7 +59,7 @@ public OuterCompositeDto myString(String myString) {
   /**
    * Get myString
    * @return myString
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_string")
@@ -79,7 +79,7 @@ public OuterCompositeDto myBoolean(Boolean myBoolean) {
   /**
    * Get myBoolean
    * @return myBoolean
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("my_boolean")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java
index a2f04a5f5d36..bec23a0b987b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java
@@ -84,7 +84,7 @@ public ParentWithNullableDto type(TypeEnum type) {
   /**
    * Get type
    * @return type
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("type")
@@ -104,7 +104,7 @@ public ParentWithNullableDto nullableProperty(String nullableProperty) {
   /**
    * Get nullableProperty
    * @return nullableProperty
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("nullableProperty")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
index 7d79f1232706..a86fa9d7ff00 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
@@ -105,7 +105,7 @@ public PetDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -125,7 +125,7 @@ public PetDto category(CategoryDto category) {
   /**
    * Get category
    * @return category
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("category")
@@ -145,7 +145,7 @@ public PetDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
   @JsonProperty("name")
@@ -173,7 +173,7 @@ public PetDto addPhotoUrlsItem(String photoUrlsItem) {
   /**
    * Get photoUrls
    * @return photoUrls
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("photoUrls")
@@ -202,7 +202,7 @@ public PetDto addTagsItem(TagDto tagsItem) {
   /**
    * Get tags
    * @return tags
-  */
+   */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("tags")
@@ -223,7 +223,7 @@ public PetDto status(StatusEnum status) {
    * pet status in the store
    * @return status
    * @deprecated
-  */
+   */
   
   @ApiModelProperty(value = "pet status in the store")
   @JsonProperty("status")
@@ -234,7 +234,7 @@ public StatusEnum getStatus() {
 
   /**
    * @deprecated
-  */
+   */
   @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
index e9a128f8d87b..4e8e02a88667 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
@@ -36,7 +36,7 @@ public ReadOnlyFirstDto bar(String bar) {
   /**
    * Get bar
    * @return bar
-  */
+   */
   
   @ApiModelProperty(readOnly = true, value = "")
   @JsonProperty("bar")
@@ -56,7 +56,7 @@ public ReadOnlyFirstDto baz(String baz) {
   /**
    * Get baz
    * @return baz
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("baz")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
index 322c4ab83aab..794d808c87f4 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
@@ -40,7 +40,7 @@ public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normal
   /**
    * Get normalPropertyName
    * @return normalPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("normalPropertyName")
@@ -60,7 +60,7 @@ public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String
   /**
    * Get UPPER_CASE_PROPERTY_SNAKE
    * @return UPPER_CASE_PROPERTY_SNAKE
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
@@ -80,7 +80,7 @@ public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String l
   /**
    * Get lowerCasePropertyDashes
    * @return lowerCasePropertyDashes
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lower-case-property-dashes")
@@ -100,7 +100,7 @@ public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String pr
   /**
    * Get propertyNameWithSpaces
    * @return propertyNameWithSpaces
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("property name with spaces")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java
index df0afe36bb75..def2be43f634 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java
@@ -35,7 +35,7 @@ public ReturnDto _return(Integer _return) {
   /**
    * Get _return
    * @return _return
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("return")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java
index 7fbb1e5b6e85..15d0c92fbde7 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java
@@ -34,7 +34,7 @@ public class SpecialModelNameDto {
   /**
    * Get $SpecialPropertyName
    * @return $SpecialPropertyName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("$special[property.name]")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java
index f681239a2f46..7ba520ba50f0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java
@@ -36,7 +36,7 @@ public TagDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -56,7 +56,7 @@ public TagDto name(String name) {
   /**
    * Get name
    * @return name
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
index 9bee0a0f8e2c..58ff542e0162 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
@@ -62,7 +62,7 @@ public TypeHolderDefaultDto stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("string_item")
@@ -82,7 +82,7 @@ public TypeHolderDefaultDto numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("number_item")
@@ -102,7 +102,7 @@ public TypeHolderDefaultDto integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("integer_item")
@@ -122,7 +122,7 @@ public TypeHolderDefaultDto boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("bool_item")
@@ -150,7 +150,7 @@ public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
index d104dba174d7..027a7ab2485c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
@@ -65,7 +65,7 @@ public TypeHolderExampleDto stringItem(String stringItem) {
   /**
    * Get stringItem
    * @return stringItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
   @JsonProperty("string_item")
@@ -85,7 +85,7 @@ public TypeHolderExampleDto numberItem(BigDecimal numberItem) {
   /**
    * Get numberItem
    * @return numberItem
-  */
+   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("number_item")
@@ -105,7 +105,7 @@ public TypeHolderExampleDto floatItem(Float floatItem) {
   /**
    * Get floatItem
    * @return floatItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
   @JsonProperty("float_item")
@@ -125,7 +125,7 @@ public TypeHolderExampleDto integerItem(Integer integerItem) {
   /**
    * Get integerItem
    * @return integerItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
   @JsonProperty("integer_item")
@@ -145,7 +145,7 @@ public TypeHolderExampleDto boolItem(Boolean boolItem) {
   /**
    * Get boolItem
    * @return boolItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
   @JsonProperty("bool_item")
@@ -173,7 +173,7 @@ public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) {
   /**
    * Get arrayItem
    * @return arrayItem
-  */
+   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
   @JsonProperty("array_item")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java
index e469bb98a5ba..9c7a9c248fcb 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java
@@ -48,7 +48,7 @@ public UserDto id(Long id) {
   /**
    * Get id
    * @return id
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("id")
@@ -68,7 +68,7 @@ public UserDto username(String username) {
   /**
    * Get username
    * @return username
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("username")
@@ -88,7 +88,7 @@ public UserDto firstName(String firstName) {
   /**
    * Get firstName
    * @return firstName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("firstName")
@@ -108,7 +108,7 @@ public UserDto lastName(String lastName) {
   /**
    * Get lastName
    * @return lastName
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("lastName")
@@ -128,7 +128,7 @@ public UserDto email(String email) {
   /**
    * Get email
    * @return email
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("email")
@@ -148,7 +148,7 @@ public UserDto password(String password) {
   /**
    * Get password
    * @return password
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("password")
@@ -168,7 +168,7 @@ public UserDto phone(String phone) {
   /**
    * Get phone
    * @return phone
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("phone")
@@ -188,7 +188,7 @@ public UserDto userStatus(Integer userStatus) {
   /**
    * User Status
    * @return userStatus
-  */
+   */
   
   @ApiModelProperty(value = "User Status")
   @JsonProperty("userStatus")
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java
index 24b7fd9a622a..013e6014ed5d 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java
@@ -103,7 +103,7 @@ public XmlItemDto attributeString(String attributeString) {
   /**
    * Get attributeString
    * @return attributeString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("attribute_string")
@@ -123,7 +123,7 @@ public XmlItemDto attributeNumber(BigDecimal attributeNumber) {
   /**
    * Get attributeNumber
    * @return attributeNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("attribute_number")
@@ -143,7 +143,7 @@ public XmlItemDto attributeInteger(Integer attributeInteger) {
   /**
    * Get attributeInteger
    * @return attributeInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("attribute_integer")
@@ -163,7 +163,7 @@ public XmlItemDto attributeBoolean(Boolean attributeBoolean) {
   /**
    * Get attributeBoolean
    * @return attributeBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("attribute_boolean")
@@ -191,7 +191,7 @@ public XmlItemDto addWrappedArrayItem(Integer wrappedArrayItem) {
   /**
    * Get wrappedArray
    * @return wrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("wrapped_array")
@@ -211,7 +211,7 @@ public XmlItemDto nameString(String nameString) {
   /**
    * Get nameString
    * @return nameString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("name_string")
@@ -231,7 +231,7 @@ public XmlItemDto nameNumber(BigDecimal nameNumber) {
   /**
    * Get nameNumber
    * @return nameNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("name_number")
@@ -251,7 +251,7 @@ public XmlItemDto nameInteger(Integer nameInteger) {
   /**
    * Get nameInteger
    * @return nameInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("name_integer")
@@ -271,7 +271,7 @@ public XmlItemDto nameBoolean(Boolean nameBoolean) {
   /**
    * Get nameBoolean
    * @return nameBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("name_boolean")
@@ -299,7 +299,7 @@ public XmlItemDto addNameArrayItem(Integer nameArrayItem) {
   /**
    * Get nameArray
    * @return nameArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_array")
@@ -327,7 +327,7 @@ public XmlItemDto addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   /**
    * Get nameWrappedArray
    * @return nameWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("name_wrapped_array")
@@ -347,7 +347,7 @@ public XmlItemDto prefixString(String prefixString) {
   /**
    * Get prefixString
    * @return prefixString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_string")
@@ -367,7 +367,7 @@ public XmlItemDto prefixNumber(BigDecimal prefixNumber) {
   /**
    * Get prefixNumber
    * @return prefixNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_number")
@@ -387,7 +387,7 @@ public XmlItemDto prefixInteger(Integer prefixInteger) {
   /**
    * Get prefixInteger
    * @return prefixInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_integer")
@@ -407,7 +407,7 @@ public XmlItemDto prefixBoolean(Boolean prefixBoolean) {
   /**
    * Get prefixBoolean
    * @return prefixBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_boolean")
@@ -435,7 +435,7 @@ public XmlItemDto addPrefixArrayItem(Integer prefixArrayItem) {
   /**
    * Get prefixArray
    * @return prefixArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_array")
@@ -463,7 +463,7 @@ public XmlItemDto addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   /**
    * Get prefixWrappedArray
    * @return prefixWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_wrapped_array")
@@ -483,7 +483,7 @@ public XmlItemDto namespaceString(String namespaceString) {
   /**
    * Get namespaceString
    * @return namespaceString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("namespace_string")
@@ -503,7 +503,7 @@ public XmlItemDto namespaceNumber(BigDecimal namespaceNumber) {
   /**
    * Get namespaceNumber
    * @return namespaceNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("namespace_number")
@@ -523,7 +523,7 @@ public XmlItemDto namespaceInteger(Integer namespaceInteger) {
   /**
    * Get namespaceInteger
    * @return namespaceInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("namespace_integer")
@@ -543,7 +543,7 @@ public XmlItemDto namespaceBoolean(Boolean namespaceBoolean) {
   /**
    * Get namespaceBoolean
    * @return namespaceBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("namespace_boolean")
@@ -571,7 +571,7 @@ public XmlItemDto addNamespaceArrayItem(Integer namespaceArrayItem) {
   /**
    * Get namespaceArray
    * @return namespaceArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_array")
@@ -599,7 +599,7 @@ public XmlItemDto addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem
   /**
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("namespace_wrapped_array")
@@ -619,7 +619,7 @@ public XmlItemDto prefixNsString(String prefixNsString) {
   /**
    * Get prefixNsString
    * @return prefixNsString
-  */
+   */
   
   @ApiModelProperty(example = "string", value = "")
   @JsonProperty("prefix_ns_string")
@@ -639,7 +639,7 @@ public XmlItemDto prefixNsNumber(BigDecimal prefixNsNumber) {
   /**
    * Get prefixNsNumber
    * @return prefixNsNumber
-  */
+   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
   @JsonProperty("prefix_ns_number")
@@ -659,7 +659,7 @@ public XmlItemDto prefixNsInteger(Integer prefixNsInteger) {
   /**
    * Get prefixNsInteger
    * @return prefixNsInteger
-  */
+   */
   
   @ApiModelProperty(example = "-2", value = "")
   @JsonProperty("prefix_ns_integer")
@@ -679,7 +679,7 @@ public XmlItemDto prefixNsBoolean(Boolean prefixNsBoolean) {
   /**
    * Get prefixNsBoolean
    * @return prefixNsBoolean
-  */
+   */
   
   @ApiModelProperty(example = "true", value = "")
   @JsonProperty("prefix_ns_boolean")
@@ -707,7 +707,7 @@ public XmlItemDto addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   /**
    * Get prefixNsArray
    * @return prefixNsArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_array")
@@ -735,7 +735,7 @@ public XmlItemDto addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem)
   /**
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
-  */
+   */
   
   @ApiModelProperty(value = "")
   @JsonProperty("prefix_ns_wrapped_array")