diff --git a/.github/workflows/docker-tag-latest-release.yml b/.github/workflows/docker-tag-latest-release.yml
index d380cacbe83d..a871f36ceadd 100644
--- a/.github/workflows/docker-tag-latest-release.yml
+++ b/.github/workflows/docker-tag-latest-release.yml
@@ -19,7 +19,7 @@ jobs:
     # This action will "unshallow" so we have all tag info
     - name: Get latest tag
       id: tagger
-      uses: jimschubert/query-tag-action@v1
+      uses: jimschubert/query-tag-action@v2
       with:
         include: 'v*'
         exclude: '*-rc*'
diff --git a/docs/generators/kotlin-server-deprecated.md b/docs/generators/kotlin-server-deprecated.md
index 778b13ee7b30..2287e954abfe 100644
--- a/docs/generators/kotlin-server-deprecated.md
+++ b/docs/generators/kotlin-server-deprecated.md
@@ -74,28 +74,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS
 
 <ul class="column-ul">
+<li>abstract</li>
+<li>actual</li>
+<li>annotation</li>
 <li>as</li>
 <li>break</li>
 <li>class</li>
+<li>companion</li>
+<li>const</li>
+<li>constructor</li>
 <li>continue</li>
+<li>crossinline</li>
+<li>data</li>
+<li>delegate</li>
 <li>do</li>
+<li>dynamic</li>
 <li>else</li>
+<li>enum</li>
+<li>expect</li>
 <li>external</li>
 <li>false</li>
+<li>field</li>
+<li>final</li>
+<li>finally</li>
 <li>for</li>
 <li>fun</li>
 <li>if</li>
+<li>import</li>
 <li>in</li>
+<li>infix</li>
+<li>init</li>
+<li>inline</li>
+<li>inner</li>
 <li>interface</li>
 <li>internal</li>
 <li>is</li>
+<li>it</li>
+<li>lateinit</li>
+<li>noinline</li>
 <li>null</li>
 <li>object</li>
 <li>open</li>
+<li>operator</li>
+<li>out</li>
+<li>override</li>
 <li>package</li>
+<li>param</li>
 <li>private</li>
+<li>property</li>
+<li>protected</li>
+<li>public</li>
+<li>receiver</li>
+<li>reified</li>
 <li>return</li>
+<li>sealed</li>
+<li>setparam</li>
 <li>super</li>
+<li>suspend</li>
+<li>tailrec</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
@@ -103,8 +139,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>typealias</li>
 <li>typeof</li>
 <li>val</li>
+<li>value</li>
 <li>var</li>
+<li>vararg</li>
 <li>when</li>
+<li>where</li>
 <li>while</li>
 </ul>
 
diff --git a/docs/generators/kotlin-server.md b/docs/generators/kotlin-server.md
index f6e6c2603433..81f75ca57859 100644
--- a/docs/generators/kotlin-server.md
+++ b/docs/generators/kotlin-server.md
@@ -76,28 +76,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS
 
 <ul class="column-ul">
+<li>abstract</li>
+<li>actual</li>
+<li>annotation</li>
 <li>as</li>
 <li>break</li>
 <li>class</li>
+<li>companion</li>
+<li>const</li>
+<li>constructor</li>
 <li>continue</li>
+<li>crossinline</li>
+<li>data</li>
+<li>delegate</li>
 <li>do</li>
+<li>dynamic</li>
 <li>else</li>
+<li>enum</li>
+<li>expect</li>
 <li>external</li>
 <li>false</li>
+<li>field</li>
+<li>final</li>
+<li>finally</li>
 <li>for</li>
 <li>fun</li>
 <li>if</li>
+<li>import</li>
 <li>in</li>
+<li>infix</li>
+<li>init</li>
+<li>inline</li>
+<li>inner</li>
 <li>interface</li>
 <li>internal</li>
 <li>is</li>
+<li>it</li>
+<li>lateinit</li>
+<li>noinline</li>
 <li>null</li>
 <li>object</li>
 <li>open</li>
+<li>operator</li>
+<li>out</li>
+<li>override</li>
 <li>package</li>
+<li>param</li>
 <li>private</li>
+<li>property</li>
+<li>protected</li>
+<li>public</li>
+<li>receiver</li>
+<li>reified</li>
 <li>return</li>
+<li>sealed</li>
+<li>setparam</li>
 <li>super</li>
+<li>suspend</li>
+<li>tailrec</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
@@ -105,8 +141,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>typealias</li>
 <li>typeof</li>
 <li>val</li>
+<li>value</li>
 <li>var</li>
+<li>vararg</li>
 <li>when</li>
+<li>where</li>
 <li>while</li>
 </ul>
 
diff --git a/docs/generators/kotlin-spring.md b/docs/generators/kotlin-spring.md
index 581524329644..5cd67ff64aae 100644
--- a/docs/generators/kotlin-spring.md
+++ b/docs/generators/kotlin-spring.md
@@ -87,28 +87,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>ApiClient</li>
 <li>ApiException</li>
 <li>ApiResponse</li>
+<li>abstract</li>
+<li>actual</li>
+<li>annotation</li>
 <li>as</li>
 <li>break</li>
 <li>class</li>
+<li>companion</li>
+<li>const</li>
+<li>constructor</li>
 <li>continue</li>
+<li>crossinline</li>
+<li>data</li>
+<li>delegate</li>
 <li>do</li>
+<li>dynamic</li>
 <li>else</li>
+<li>enum</li>
+<li>expect</li>
 <li>external</li>
 <li>false</li>
+<li>field</li>
+<li>final</li>
+<li>finally</li>
 <li>for</li>
 <li>fun</li>
 <li>if</li>
+<li>import</li>
 <li>in</li>
+<li>infix</li>
+<li>init</li>
+<li>inline</li>
+<li>inner</li>
 <li>interface</li>
 <li>internal</li>
 <li>is</li>
+<li>it</li>
+<li>lateinit</li>
+<li>noinline</li>
 <li>null</li>
 <li>object</li>
 <li>open</li>
+<li>operator</li>
+<li>out</li>
+<li>override</li>
 <li>package</li>
+<li>param</li>
 <li>private</li>
+<li>property</li>
+<li>protected</li>
+<li>public</li>
+<li>receiver</li>
+<li>reified</li>
 <li>return</li>
+<li>sealed</li>
+<li>setparam</li>
 <li>super</li>
+<li>suspend</li>
+<li>tailrec</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
@@ -116,8 +152,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>typealias</li>
 <li>typeof</li>
 <li>val</li>
+<li>value</li>
 <li>var</li>
+<li>vararg</li>
 <li>when</li>
+<li>where</li>
 <li>while</li>
 </ul>
 
diff --git a/docs/generators/kotlin-vertx.md b/docs/generators/kotlin-vertx.md
index 246ffa62a64e..90afde4de81c 100644
--- a/docs/generators/kotlin-vertx.md
+++ b/docs/generators/kotlin-vertx.md
@@ -68,28 +68,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS
 
 <ul class="column-ul">
+<li>abstract</li>
+<li>actual</li>
+<li>annotation</li>
 <li>as</li>
 <li>break</li>
 <li>class</li>
+<li>companion</li>
+<li>const</li>
+<li>constructor</li>
 <li>continue</li>
+<li>crossinline</li>
+<li>data</li>
+<li>delegate</li>
 <li>do</li>
+<li>dynamic</li>
 <li>else</li>
+<li>enum</li>
+<li>expect</li>
 <li>external</li>
 <li>false</li>
+<li>field</li>
+<li>final</li>
+<li>finally</li>
 <li>for</li>
 <li>fun</li>
 <li>if</li>
+<li>import</li>
 <li>in</li>
+<li>infix</li>
+<li>init</li>
+<li>inline</li>
+<li>inner</li>
 <li>interface</li>
 <li>internal</li>
 <li>is</li>
+<li>it</li>
+<li>lateinit</li>
+<li>noinline</li>
 <li>null</li>
 <li>object</li>
 <li>open</li>
+<li>operator</li>
+<li>out</li>
+<li>override</li>
 <li>package</li>
+<li>param</li>
 <li>private</li>
+<li>property</li>
+<li>protected</li>
+<li>public</li>
+<li>receiver</li>
+<li>reified</li>
 <li>return</li>
+<li>sealed</li>
+<li>setparam</li>
 <li>super</li>
+<li>suspend</li>
+<li>tailrec</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
@@ -97,8 +133,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>typealias</li>
 <li>typeof</li>
 <li>val</li>
+<li>value</li>
 <li>var</li>
+<li>vararg</li>
 <li>when</li>
+<li>where</li>
 <li>while</li>
 </ul>
 
diff --git a/docs/generators/kotlin.md b/docs/generators/kotlin.md
index 8f853b41cac8..089db56e616b 100644
--- a/docs/generators/kotlin.md
+++ b/docs/generators/kotlin.md
@@ -78,28 +78,64 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 ## RESERVED WORDS
 
 <ul class="column-ul">
+<li>abstract</li>
+<li>actual</li>
+<li>annotation</li>
 <li>as</li>
 <li>break</li>
 <li>class</li>
+<li>companion</li>
+<li>const</li>
+<li>constructor</li>
 <li>continue</li>
+<li>crossinline</li>
+<li>data</li>
+<li>delegate</li>
 <li>do</li>
+<li>dynamic</li>
 <li>else</li>
+<li>enum</li>
+<li>expect</li>
 <li>external</li>
 <li>false</li>
+<li>field</li>
+<li>final</li>
+<li>finally</li>
 <li>for</li>
 <li>fun</li>
 <li>if</li>
+<li>import</li>
 <li>in</li>
+<li>infix</li>
+<li>init</li>
+<li>inline</li>
+<li>inner</li>
 <li>interface</li>
 <li>internal</li>
 <li>is</li>
+<li>it</li>
+<li>lateinit</li>
+<li>noinline</li>
 <li>null</li>
 <li>object</li>
 <li>open</li>
+<li>operator</li>
+<li>out</li>
+<li>override</li>
 <li>package</li>
+<li>param</li>
 <li>private</li>
+<li>property</li>
+<li>protected</li>
+<li>public</li>
+<li>receiver</li>
+<li>reified</li>
 <li>return</li>
+<li>sealed</li>
+<li>setparam</li>
 <li>super</li>
+<li>suspend</li>
+<li>tailrec</li>
 <li>this</li>
 <li>throw</li>
 <li>true</li>
@@ -107,8 +143,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>typealias</li>
 <li>typeof</li>
 <li>val</li>
+<li>value</li>
 <li>var</li>
+<li>vararg</li>
 <li>when</li>
+<li>where</li>
 <li>while</li>
 </ul>
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
index 60ad7a12f7db..bc6c00793588 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractKotlinCodegen.java
@@ -99,24 +99,64 @@ public AbstractKotlinCodegen() {
         // this includes hard reserved words defined by https://github.com/JetBrains/kotlin/blob/master/core/descriptors/src/org/jetbrains/kotlin/renderer/KeywordStringsGenerated.java
         // as well as keywords from https://kotlinlang.org/docs/reference/keyword-reference.html
         reservedWords = new HashSet<String>(Arrays.asList(
+                "abstract",
+                "actual",
+                "annotation",
                 "as",
                 "break",
                 "class",
+                "companion",
+                "const",
+                "constructor",
                 "continue",
+                "crossinline",
+                "data",
+                "delegate",
                 "do",
+                "dynamic",
                 "else",
+                "enum",
+                "expect",
+                "external",
                 "false",
+                "field",
+                "final",
+                "finally",
                 "for",
                 "fun",
                 "if",
+                "import",
                 "in",
+                "infix",
+                "init",
+                "inline",
+                "inner",
                 "interface",
+                "internal",
                 "is",
+                "it",
+                "lateinit",
+                "noinline",
                 "null",
                 "object",
+                "open",
+                "operator",
+                "out",
+                "override",
                 "package",
+                "param",
+                "private",
+                "property",
+                "protected",
+                "public",
+                "receiver",
+                "reified",
                 "return",
+                "sealed",
+                "setparam",
                 "super",
+                "suspend",
+                "tailrec",
                 "this",
                 "throw",
                 "true",
@@ -124,13 +164,12 @@ public AbstractKotlinCodegen() {
                 "typealias",
                 "typeof",
                 "val",
+                "value",
                 "var",
+                "vararg",
                 "when",
-                "while",
-                "private",
-                "open",
-                "external",
-                "internal"
+                "where",
+                "while"
         ));
 
         defaultIncludes = new HashSet<String>(Arrays.asList(
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
index 093d30318393..3cc72993e610 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class.mustache
@@ -38,6 +38,7 @@ import java.io.Serializable
 
 /**
  * {{{description}}}
+ *
 {{#allVars}}
  * @param {{{name}}} {{{description}}}
 {{/allVars}}
@@ -50,8 +51,10 @@ import java.io.Serializable
 @Deprecated(message = "This schema is deprecated.")
 {{/isDeprecated}}
 {{#nonPublicApi}}internal {{/nonPublicApi}}{{#discriminator}}interface{{/discriminator}}{{^discriminator}}data class{{/discriminator}} {{classname}}{{^discriminator}} (
+
 {{#allVars}}
 {{#required}}{{>data_class_req_var}}{{/required}}{{^required}}{{>data_class_opt_var}}{{/required}}{{^-last}},{{/-last}}
+
 {{/allVars}}
 ){{/discriminator}}{{#parent}}{{^serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{^parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{^serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#parent}}{{#serializableModel}}{{#parcelizeModels}} : {{{parent}}}{{#isMap}}(){{/isMap}}{{#isArray}}(){{/isArray}}, Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{^parcelizeModels}} : Serializable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{^serializableModel}}{{#parcelizeModels}} : Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{^parent}}{{#serializableModel}}{{#parcelizeModels}} : Serializable, Parcelable{{/parcelizeModels}}{{/serializableModel}}{{/parent}}{{#vendorExtensions.x-has-data-class-body}} {
 {{/vendorExtensions.x-has-data-class-body}}
@@ -68,6 +71,7 @@ import java.io.Serializable
 {{#isEnum}}
     /**
      * {{{description}}}
+     *
      * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
      */
     {{^multiplatform}}
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache
index d7a2fcf31bdf..a8d7695e2db5 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/data_class_req_var.mustache
@@ -18,4 +18,4 @@
     {{#deprecated}}
     @Deprecated(message = "This property is deprecated.")
     {{/deprecated}}
-    {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#isUniqueItems}}kotlin.collections.Set{{/isUniqueItems}}{{^isUniqueItems}}kotlin.collections.List{{/isUniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInCamelCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{#isNullable}}?{{/isNullable}}
\ No newline at end of file
+    {{#multiplatform}}@SerialName(value = "{{{vendorExtensions.x-base-name-literal}}}") @Required {{/multiplatform}}{{#isInherited}}override {{/isInherited}}{{>modelMutable}} {{{name}}}: {{#isArray}}{{#isList}}{{#isUniqueItems}}kotlin.collections.Set{{/isUniqueItems}}{{^isUniqueItems}}kotlin.collections.List{{/isUniqueItems}}{{/isList}}{{^isList}}kotlin.Array{{/isList}}<{{^items.isEnum}}{{^items.isPrimitiveType}}{{^items.isModel}}{{#kotlinx_serialization}}@Contextual {{/kotlinx_serialization}}{{/items.isModel}}{{/items.isPrimitiveType}}{{{items.dataType}}}{{/items.isEnum}}{{#items.isEnum}}{{classname}}.{{{nameInCamelCase}}}{{/items.isEnum}}>{{/isArray}}{{^isEnum}}{{^isArray}}{{{dataType}}}{{/isArray}}{{/isEnum}}{{#isEnum}}{{^isArray}}{{classname}}.{{{nameInCamelCase}}}{{/isArray}}{{/isEnum}}{{#isNullable}}?{{/isNullable}}{{#defaultValue}} = {{{defaultValue}}}{{/defaultValue}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
index 4a6a7acfa314..3548914cd0a9 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/enum_class.mustache
@@ -18,13 +18,12 @@ import kotlinx.serialization.*
 {{/multiplatform}}
 
 /**
-* {{{description}}}
-* Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
-*/
-
-{{#multiplatform}}@Serializable{{/multiplatform}}{{#kotlinx_serialization}}@Serializable{{/kotlinx_serialization}}
+ * {{{description}}}
+ *
+ * Values: {{#allowableValues}}{{#enumVars}}{{&name}}{{^-last}},{{/-last}}{{/enumVars}}{{/allowableValues}}
+ */
+{{#multiplatform}}@Serializable(with = {{classname}}.Serializer::class){{/multiplatform}}{{#kotlinx_serialization}}@Serializable{{/kotlinx_serialization}}
 {{#nonPublicApi}}internal {{/nonPublicApi}}enum class {{classname}}(val value: {{{dataType}}}) {
-
 {{#allowableValues}}{{#enumVars}}
     {{^multiplatform}}
     {{#moshi}}
@@ -55,12 +54,29 @@ import kotlinx.serialization.*
     {{&name}}({{{value}}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
     {{/isArray}}
 {{/enumVars}}{{/allowableValues}}
-
     /**
-    This override toString avoids using the enum var name and uses the actual api value instead.
-    In cases the var name and value are different, the client would send incorrect enums to the server.
-    **/
-    override fun toString(): String {
-        return value{{^isString}}.toString(){{/isString}}
+     * Override toString() to avoid using the enum variable name as the value, and instead use
+     * the actual value defined in the API spec file.
+     *
+     * This solves a problem when the variable name and its value are different, and ensures that
+     * the client sends the correct enum values to the server always.
+     */
+    override fun toString(): String = value{{^isString}}.toString(){{/isString}}
+
+    companion object {
+        /**
+         * Converts the provided [data] to a [String] on success, null otherwise.
+         */
+        fun encode(data: Any?): kotlin.String? = if (data is {{classname}}) "$data" else null
+
+        /**
+         * Returns a valid [{{classname}}] for [data], null otherwise.
+         */
+        fun decode(data: Any?): {{classname}}? = data?.let {
+          val normalizedData = "$it".lowercase()
+          values().firstOrNull { value ->
+            it == value || normalizedData == "$value".lowercase()
+          }
+        }
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache
index 32384488b9ad..7488e6a9f573 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/libraries/jvm-retrofit2/auth/HttpBearerAuth.kt.mustache
@@ -33,7 +33,7 @@ class HttpBearerAuth(
     }
 
     private fun upperCaseBearer(): String {
-        return if (schema.toLowerCase().equals("bearer")) "Bearer" else schema
+        return if (schema.lowercase().equals("bearer")) "Bearer" else schema
     }
 
 }
diff --git a/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache b/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache
index 3a547de74bb7..d77219ff5ee3 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-client/licenseInfo.mustache
@@ -1,11 +1,19 @@
 /**
-* {{{appName}}}
-* {{{appDescription}}}
-*
-* {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}}
-* {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
\ No newline at end of file
+ * {{{appName}}}
+ *
+ * {{{appDescription}}}
+ *
+ * {{#version}}The version of the OpenAPI document: {{{version}}}{{/version}}
+ * {{#infoEmail}}Contact: {{{infoEmail}}}{{/infoEmail}}
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index be50dd6c442b..40670673b69c 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 54df813fceec..b50d6f2bde47 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,17 +25,22 @@ import com.google.gson.annotations.SerializedName
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @SerializedName("code")
     val code: kotlin.Int? = null,
+
     @SerializedName("type")
     val type: kotlin.String? = null,
+
     @SerializedName("message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt
index fdefa74fda0b..f9b43a4a716d 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.google.gson.annotations.SerializedName
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
index 05e8a533cb9e..6f2bc958cfe6 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.google.gson.annotations.SerializedName
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -25,23 +35,31 @@ import com.google.gson.annotations.SerializedName
  */
 
 data class Order (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("petId")
     val petId: kotlin.Long? = null,
+
     @SerializedName("quantity")
     val quantity: kotlin.Int? = null,
+
     @SerializedName("shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @SerializedName("status")
     val status: Order.Status? = null,
+
     @SerializedName("complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt
index cbefe8712ef8..7bcec4de9273 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -18,6 +27,7 @@ import com.google.gson.annotations.SerializedName
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -27,23 +37,31 @@ import com.google.gson.annotations.SerializedName
  */
 
 data class Pet (
+
     @SerializedName("name")
     val name: kotlin.String,
+
     @SerializedName("photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("category")
     val category: Category? = null,
+
     @SerializedName("tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @SerializedName("status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 28e82b1df685..dbf125cb0ba3 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.google.gson.annotations.SerializedName
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt
index 62baf33e927e..631e09ec6bfc 100644
--- a/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-gson/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.google.gson.annotations.SerializedName
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -27,22 +37,31 @@ import com.google.gson.annotations.SerializedName
  */
 
 data class User (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("username")
     val username: kotlin.String? = null,
+
     @SerializedName("firstName")
     val firstName: kotlin.String? = null,
+
     @SerializedName("lastName")
     val lastName: kotlin.String? = null,
+
     @SerializedName("email")
     val email: kotlin.String? = null,
+
     @SerializedName("password")
     val password: kotlin.String? = null,
+
     @SerializedName("phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @SerializedName("userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index be50dd6c442b..40670673b69c 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index c341f8ca321b..94a0b0b47d44 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,17 +25,22 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @field:JsonProperty("code")
     val code: kotlin.Int? = null,
+
     @field:JsonProperty("type")
     val type: kotlin.String? = null,
+
     @field:JsonProperty("message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
index 2ed5390c1f3a..6deb64d4d33a 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @field:JsonProperty("id")
     val id: kotlin.Long? = null,
+
     @field:JsonProperty("name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
index 4a2d6e0bd574..e3361219965f 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -25,23 +35,31 @@ import com.fasterxml.jackson.annotation.JsonProperty
  */
 
 data class Order (
+
     @field:JsonProperty("id")
     val id: kotlin.Long? = null,
+
     @field:JsonProperty("petId")
     val petId: kotlin.Long? = null,
+
     @field:JsonProperty("quantity")
     val quantity: kotlin.Int? = null,
+
     @field:JsonProperty("shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @field:JsonProperty("status")
     val status: Order.Status? = null,
+
     @field:JsonProperty("complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: PLACED,APPROVED,DELIVERED
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
index fa98c892601b..bae9497a1758 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -18,6 +27,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -27,23 +37,31 @@ import com.fasterxml.jackson.annotation.JsonProperty
  */
 
 data class Pet (
+
     @field:JsonProperty("name")
     val name: kotlin.String,
+
     @field:JsonProperty("photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @field:JsonProperty("id")
     val id: kotlin.Long? = null,
+
     @field:JsonProperty("category")
     val category: Category? = null,
+
     @field:JsonProperty("tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @field:JsonProperty("status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: AVAILABLE,PENDING,SOLD
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 7243f42ed7d8..cb7be4de1811 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @field:JsonProperty("id")
     val id: kotlin.Long? = null,
+
     @field:JsonProperty("name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt
index e8f639e50928..64042f583b09 100644
--- a/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-jackson/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -27,22 +37,31 @@ import com.fasterxml.jackson.annotation.JsonProperty
  */
 
 data class User (
+
     @field:JsonProperty("id")
     val id: kotlin.Long? = null,
+
     @field:JsonProperty("username")
     val username: kotlin.String? = null,
+
     @field:JsonProperty("firstName")
     val firstName: kotlin.String? = null,
+
     @field:JsonProperty("lastName")
     val lastName: kotlin.String? = null,
+
     @field:JsonProperty("email")
     val email: kotlin.String? = null,
+
     @field:JsonProperty("password")
     val password: kotlin.String? = null,
+
     @field:JsonProperty("phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @field:JsonProperty("userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index cb784ddba8b0..4f75772cdd00 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 5e349f9f96e0..c53f3e313eca 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,6 +27,7 @@ import kotlinx.parcelize.Parcelize
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
@@ -25,11 +35,15 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 ) : Parcelable
 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt
index 38cc22268468..51c35a061e1b 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,15 +27,19 @@ import kotlinx.parcelize.Parcelize
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 @Parcelize
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Parcelable
 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
index 7e9d9fc46441..c5066202ee3f 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,6 +27,7 @@ import kotlinx.parcelize.Parcelize
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -28,23 +38,31 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) : Parcelable {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 35de5ef28a2a..6ff38c8e0d5d 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -20,6 +29,7 @@ import kotlinx.parcelize.Parcelize
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -30,23 +40,31 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) : Parcelable {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
index dc72586b9919..18421bb3ac3a 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,15 +27,19 @@ import kotlinx.parcelize.Parcelize
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 @Parcelize
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Parcelable
 
diff --git a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt
index 9a840f06e7fa..22889800c036 100644
--- a/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-json-request-string/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,6 +27,7 @@ import kotlinx.parcelize.Parcelize
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -30,22 +40,31 @@ import kotlinx.parcelize.Parcelize
 @Parcelize
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 ) : Parcelable
 
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 9ae9e8f0890b..ebc04af49622 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index e9120ae8209a..6349ba587bd9 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index da3c33f134b2..62b8abae696c 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index fc89bf34e7fc..dfb777a87f72 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,18 +26,23 @@ import java.io.Serializable
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @SerializedName("code")
     val code: kotlin.Int? = null,
+
     @SerializedName("type")
     val type: kotlin.String? = null,
+
     @SerializedName("message")
     val message: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
index b483bee69b3e..c2c611fdbe28 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
index 8980b2883ef1..e69b6f68ac71 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -26,19 +36,26 @@ import java.io.Serializable
  */
 
 data class Order (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("petId")
     val petId: kotlin.Long? = null,
+
     @SerializedName("quantity")
     val quantity: kotlin.Int? = null,
+
     @SerializedName("shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @SerializedName("status")
     val status: Order.Status? = null,
+
     @SerializedName("complete")
     val complete: kotlin.Boolean? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -46,6 +63,7 @@ data class Order (
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 7ddddd99e962..e5732a1f240b 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -19,6 +28,7 @@ import java.io.Serializable
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -28,19 +38,26 @@ import java.io.Serializable
  */
 
 data class Pet (
+
     @SerializedName("name")
     val name: kotlin.String,
+
     @SerializedName("photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("category")
     val category: Category? = null,
+
     @SerializedName("tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @SerializedName("status")
     val status: Pet.Status? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -48,6 +65,7 @@ data class Pet (
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
index a1a282cb38df..f39d14831abf 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
index 59ba0254f603..6f5e04a7bccd 100644
--- a/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-jvm-okhttp4-coroutines/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -28,23 +38,32 @@ import java.io.Serializable
  */
 
 data class User (
+
     @SerializedName("id")
     val id: kotlin.Long? = null,
+
     @SerializedName("username")
     val username: kotlin.String? = null,
+
     @SerializedName("firstName")
     val firstName: kotlin.String? = null,
+
     @SerializedName("lastName")
     val lastName: kotlin.String? = null,
+
     @SerializedName("email")
     val email: kotlin.String? = null,
+
     @SerializedName("password")
     val password: kotlin.String? = null,
+
     @SerializedName("phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @SerializedName("userStatus")
     val userStatus: kotlin.Int? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index be50dd6c442b..40670673b69c 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 18d2ce3dbbe7..9db3de682287 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,17 +26,22 @@ import com.squareup.moshi.JsonClass
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 @JsonClass(generateAdapter = true)
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt
index 8396fa423574..60e6efed3bb6 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,14 +26,18 @@ import com.squareup.moshi.JsonClass
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 @JsonClass(generateAdapter = true)
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt
index 1a84efc4cb18..1afbd25c024b 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import com.squareup.moshi.JsonClass
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -26,23 +36,31 @@ import com.squareup.moshi.JsonClass
  */
 @JsonClass(generateAdapter = true)
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 633f509bbd2f..3da7fac874db 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -19,6 +28,7 @@ import com.squareup.moshi.JsonClass
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -28,23 +38,31 @@ import com.squareup.moshi.JsonClass
  */
 @JsonClass(generateAdapter = true)
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt
index e7cdab2bb5df..c64e4efbed1c 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,14 +26,18 @@ import com.squareup.moshi.JsonClass
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 @JsonClass(generateAdapter = true)
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt
index 1bfad8449046..59c0398042c3 100644
--- a/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-moshi-codegen/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import com.squareup.moshi.JsonClass
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -28,22 +38,31 @@ import com.squareup.moshi.JsonClass
  */
 @JsonClass(generateAdapter = true)
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
index 5df1dfc40ee4..2d2f96b6b89d 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
index 345ef648864b..eb85ffc9f1cf 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
index 6e1f7d50f258..4d16f664b831 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
index 91150fbf26b7..0358a25b5409 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,14 +27,19 @@ import kotlinx.serialization.encoding.*
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 @Serializable
 data class ApiResponse (
+
     @SerialName(value = "code") val code: kotlin.Int? = null,
+
     @SerialName(value = "type") val type: kotlin.String? = null,
+
     @SerialName(value = "message") val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
index 8c17893935b0..a13ef95df057 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,12 +27,16 @@ import kotlinx.serialization.encoding.*
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 @Serializable
 data class Category (
+
     @SerialName(value = "id") val id: kotlin.Long? = null,
+
     @SerialName(value = "name") val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
index f5ae575d19ed..737e56528bea 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,6 +27,7 @@ import kotlinx.serialization.encoding.*
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -27,17 +37,25 @@ import kotlinx.serialization.encoding.*
  */
 @Serializable
 data class Order (
+
     @SerialName(value = "id") val id: kotlin.Long? = null,
+
     @SerialName(value = "petId") val petId: kotlin.Long? = null,
+
     @SerialName(value = "quantity") val quantity: kotlin.Int? = null,
+
     @SerialName(value = "shipDate") val shipDate: kotlin.String? = null,
+
     /* Order Status */
     @SerialName(value = "status") val status: Order.Status? = null,
+
     @SerialName(value = "complete") val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     @Serializable
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
index 55879c6c7ac6..acc9ed19e36c 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -20,6 +29,7 @@ import kotlinx.serialization.encoding.*
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -29,17 +39,25 @@ import kotlinx.serialization.encoding.*
  */
 @Serializable
 data class Pet (
+
     @SerialName(value = "name") @Required val name: kotlin.String,
+
     @SerialName(value = "photoUrls") @Required val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @SerialName(value = "id") val id: kotlin.Long? = null,
+
     @SerialName(value = "category") val category: Category? = null,
+
     @SerialName(value = "tags") val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @SerialName(value = "status") val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     @Serializable
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
index 54a4e01d29a0..fa092c965687 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,12 +27,16 @@ import kotlinx.serialization.encoding.*
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 @Serializable
 data class Tag (
+
     @SerialName(value = "id") val id: kotlin.Long? = null,
+
     @SerialName(value = "name") val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
index 4c69c432e2e7..5c5b18c0d053 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonMain/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -18,6 +27,7 @@ import kotlinx.serialization.encoding.*
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -29,14 +39,23 @@ import kotlinx.serialization.encoding.*
  */
 @Serializable
 data class User (
+
     @SerialName(value = "id") val id: kotlin.Long? = null,
+
     @SerialName(value = "username") val username: kotlin.String? = null,
+
     @SerialName(value = "firstName") val firstName: kotlin.String? = null,
+
     @SerialName(value = "lastName") val lastName: kotlin.String? = null,
+
     @SerialName(value = "email") val email: kotlin.String? = null,
+
     @SerialName(value = "password") val password: kotlin.String? = null,
+
     @SerialName(value = "phone") val phone: kotlin.String? = null,
+
     /* User Status */
     @SerialName(value = "userStatus") val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt b/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt
index fcff288bfef6..d7f388f67ddc 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/commonTest/kotlin/util/Coroutine.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 
 package util
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt b/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt
index b8b36f3f7596..2ddea12d6a35 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/iosTest/kotlin/util/Coroutine.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 
 package util
 
diff --git a/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt b/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt
index b8b36f3f7596..2ddea12d6a35 100644
--- a/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt
+++ b/samples/client/petstore/kotlin-multiplatform/src/jvmTest/kotlin/util/Coroutine.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 
 package util
 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 7919953d4b4a..5d1237fe7f0b 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 10e2b9460056..eaba8410d1b5 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 4983dc73feb7..f9b43b197359 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index a695278dfa3c..a38d613adbe6 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,17 +25,22 @@ import com.squareup.moshi.Json
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 internal data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt
index 376994a9b250..9de433b75e7c 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 internal data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt
index a5e3ef5a2898..2ccfb38a9c6b 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -25,23 +35,31 @@ import com.squareup.moshi.Json
  */
 
 internal data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     internal enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 1609ba878dc0..88ce520dd5a4 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -18,6 +27,7 @@ import com.squareup.moshi.Json
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -27,23 +37,31 @@ import com.squareup.moshi.Json
  */
 
 internal data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     internal enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt
index d9b84e93eafd..5e750974813f 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 internal data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt
index e0e821cd7e38..fa92a880d317 100644
--- a/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-nonpublic/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -27,22 +37,31 @@ import com.squareup.moshi.Json
  */
 
 internal data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index 401a66cf94da..8c27503582dc 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index d8b1ad578f5f..c616a2dd05c6 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index a88481301162..c65ff9948ae2 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 7d40c8efbc2f..617982fdfe3b 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,18 +26,23 @@ import java.io.Serializable
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
index ceb0fbc8fe60..f458d178e337 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
index 941b2ec6d396..beaf9bbc2d3f 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -26,19 +36,26 @@ import java.io.Serializable
  */
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -46,6 +63,7 @@ data class Order (
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 079c44f026a4..0ad65abf40e1 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -19,6 +28,7 @@ import java.io.Serializable
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -28,19 +38,26 @@ import java.io.Serializable
  */
 
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -48,6 +65,7 @@ data class Pet (
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 944b1cd0a141..ded73dc723db 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
index 9697f07d5bf8..03d55050eb8d 100644
--- a/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-nullable/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -28,23 +38,32 @@ import java.io.Serializable
  */
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index be50dd6c442b..40670673b69c 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index fafca8738f66..d430296dc4da 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,17 +25,22 @@ import com.squareup.moshi.Json
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt
index a4c17c3b49dd..94a40441cbee 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2bdaec85131d..7e63926e7ff3 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -25,23 +35,31 @@ import com.squareup.moshi.Json
  */
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0e38da34b79e..fb28ee922256 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -18,6 +27,7 @@ import com.squareup.moshi.Json
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -27,23 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 6e619023a5c9..fcd3c28dcd7a 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt
index af1e270325de..ab10e1ddfd3d 100644
--- a/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-okhttp3/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -27,22 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index fbe55ab909fa..0773d7f17d9f 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -19,18 +28,23 @@ import java.io.Serializable
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 @KSerializable
 data class ApiResponse (
+
     @SerialName(value = "code")
     val code: kotlin.Int? = null,
+
     @SerialName(value = "type")
     val type: kotlin.String? = null,
+
     @SerialName(value = "message")
     val message: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt
index 5b2c9a487de0..6a45df20b83d 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -19,15 +28,19 @@ import java.io.Serializable
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 @KSerializable
 data class Category (
+
     @SerialName(value = "id")
     val id: kotlin.Long? = null,
+
     @SerialName(value = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt
index 4121b6fbbbbe..7146ee9cc585 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -19,6 +28,7 @@ import java.io.Serializable
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -28,19 +38,26 @@ import java.io.Serializable
  */
 @KSerializable
 data class Order (
+
     @SerialName(value = "id")
     val id: kotlin.Long? = null,
+
     @SerialName(value = "petId")
     val petId: kotlin.Long? = null,
+
     @SerialName(value = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Contextual @SerialName(value = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @SerialName(value = "status")
     val status: Order.Status? = null,
+
     @SerialName(value = "complete")
     val complete: kotlin.Boolean? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -48,6 +65,7 @@ data class Order (
 
     /**
      * Order Status
+     *
      * Values: PLACED,APPROVED,DELIVERED
      */
     @KSerializable
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt
index ea1cd27b2627..a3c43c02c9bd 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -21,6 +30,7 @@ import java.io.Serializable
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -30,19 +40,26 @@ import java.io.Serializable
  */
 @KSerializable
 data class Pet (
+
     @SerialName(value = "name")
     val name: kotlin.String,
+
     @SerialName(value = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @SerialName(value = "id")
     val id: kotlin.Long? = null,
+
     @SerialName(value = "category")
     val category: Category? = null,
+
     @SerialName(value = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @SerialName(value = "status")
     val status: Pet.Status? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -50,6 +67,7 @@ data class Pet (
 
     /**
      * pet status in the store
+     *
      * Values: AVAILABLE,PENDING,SOLD
      */
     @KSerializable
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt
index e26edf9170ad..29286beda553 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -19,15 +28,19 @@ import java.io.Serializable
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 @KSerializable
 data class Tag (
+
     @SerialName(value = "id")
     val id: kotlin.Long? = null,
+
     @SerialName(value = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt
index 23231a7536e9..061530974115 100644
--- a/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-retrofit2-kotlinx_serialization/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -19,6 +28,7 @@ import java.io.Serializable
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -30,23 +40,32 @@ import java.io.Serializable
  */
 @KSerializable
 data class User (
+
     @SerialName(value = "id")
     val id: kotlin.Long? = null,
+
     @SerialName(value = "username")
     val username: kotlin.String? = null,
+
     @SerialName(value = "firstName")
     val firstName: kotlin.String? = null,
+
     @SerialName(value = "lastName")
     val lastName: kotlin.String? = null,
+
     @SerialName(value = "email")
     val email: kotlin.String? = null,
+
     @SerialName(value = "password")
     val password: kotlin.String? = null,
+
     @SerialName(value = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @SerialName(value = "userStatus")
     val userStatus: kotlin.Int? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index fafca8738f66..d430296dc4da 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,17 +25,22 @@ import com.squareup.moshi.Json
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt
index a4c17c3b49dd..94a40441cbee 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2bdaec85131d..7e63926e7ff3 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -25,23 +35,31 @@ import com.squareup.moshi.Json
  */
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0e38da34b79e..fb28ee922256 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -18,6 +27,7 @@ import com.squareup.moshi.Json
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -27,23 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 6e619023a5c9..fcd3c28dcd7a 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt
index af1e270325de..ab10e1ddfd3d 100644
--- a/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-retrofit2-rx3/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -27,22 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index fafca8738f66..d430296dc4da 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,17 +25,22 @@ import com.squareup.moshi.Json
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt
index a4c17c3b49dd..94a40441cbee 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt
index 2bdaec85131d..7e63926e7ff3 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -25,23 +35,31 @@ import com.squareup.moshi.Json
  */
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0e38da34b79e..fb28ee922256 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -18,6 +27,7 @@ import com.squareup.moshi.Json
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -27,23 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 6e619023a5c9..fcd3c28dcd7a 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt
index af1e270325de..ab10e1ddfd3d 100644
--- a/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-retrofit2/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -27,22 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index fde3a1918c9e..3847bd974ef7 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 7d40c8efbc2f..617982fdfe3b 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,18 +26,23 @@ import java.io.Serializable
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
index ceb0fbc8fe60..f458d178e337 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
index 3484f720ad7b..12de5d3d9f78 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -26,19 +36,26 @@ import java.io.Serializable
  */
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: kotlin.String? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -46,6 +63,7 @@ data class Order (
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
index e87900fbea09..51546bc6eee2 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -19,6 +28,7 @@ import java.io.Serializable
 
 /**
  * A pet for sale in the pet store
+ *
  * @param id 
  * @param category 
  * @param name 
@@ -28,19 +38,26 @@ import java.io.Serializable
  */
 
 data class Pet (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -48,6 +65,7 @@ data class Pet (
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 944b1cd0a141..ded73dc723db 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
index 9697f07d5bf8..03d55050eb8d 100644
--- a/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-string/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -28,23 +38,32 @@ import java.io.Serializable
  */
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index be50dd6c442b..40670673b69c 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index fafca8738f66..d430296dc4da 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,17 +25,22 @@ import com.squareup.moshi.Json
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
index a4c17c3b49dd..94a40441cbee 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
index 4221574da262..7c8f86f72cd3 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -25,23 +35,31 @@ import com.squareup.moshi.Json
  */
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: org.threeten.bp.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) {
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 0e38da34b79e..fb28ee922256 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -18,6 +27,7 @@ import com.squareup.moshi.Json
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -27,23 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) {
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 6e619023a5c9..fcd3c28dcd7a 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,14 +25,18 @@ import com.squareup.moshi.Json
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
index af1e270325de..ab10e1ddfd3d 100644
--- a/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin-threetenbp/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -16,6 +25,7 @@ import com.squareup.moshi.Json
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -27,22 +37,31 @@ import com.squareup.moshi.Json
  */
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 )
 
diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
index 59cebc5d4b98..59ed587ef746 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
+++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/apis/EnumApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* Test for issue 4062
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * Test for issue 4062
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.PetEnum
diff --git a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt
index 0bc84e75f739..aa6831225a20 100644
--- a/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt
+++ b/samples/client/petstore/kotlin-uppercase-enum/src/main/kotlin/org/openapitools/client/models/PetEnum.kt
@@ -1,41 +1,66 @@
 /**
-* OpenAPI Petstore
-* Test for issue 4062
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * Test for issue 4062
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
 import com.squareup.moshi.Json
 
 /**
-* An enum with complex-ish naming
-* Values: MY_FIRST_VALUE,MY_SECOND_VALUE
-*/
-
+ * An enum with complex-ish naming
+ *
+ * Values: MY_FIRST_VALUE,MY_SECOND_VALUE
+ */
 
 enum class PetEnum(val value: kotlin.String) {
 
-
     @Json(name = "myFirstValue")
     MY_FIRST_VALUE("myFirstValue"),
 
     @Json(name = "MY_SECOND_VALUE")
     MY_SECOND_VALUE("MY_SECOND_VALUE");
 
-
     /**
-    This override toString avoids using the enum var name and uses the actual api value instead.
-    In cases the var name and value are different, the client would send incorrect enums to the server.
-    **/
-    override fun toString(): String {
-        return value
+     * Override toString() to avoid using the enum variable name as the value, and instead use
+     * the actual value defined in the API spec file.
+     *
+     * This solves a problem when the variable name and its value are different, and ensures that
+     * the client sends the correct enum values to the server always.
+     */
+    override fun toString(): String = value
+
+    companion object {
+        /**
+         * Converts the provided [data] to a [String] on success, null otherwise.
+         */
+        fun encode(data: Any?): kotlin.String? = if (data is PetEnum) "$data" else null
+
+        /**
+         * Returns a valid [PetEnum] for [data], null otherwise.
+         */
+        fun decode(data: Any?): PetEnum? = data?.let {
+          val normalizedData = "$it".lowercase()
+          values().firstOrNull { value ->
+            it == value || normalizedData == "$value".lowercase()
+          }
+        }
     }
 }
 
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
index be50dd6c442b..40670673b69c 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/PetApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.ApiResponse
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
index 56a23202f82c..dcd1f62cea74 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/StoreApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.Order
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
index 9f93e853a122..944439037608 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/apis/UserApi.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.apis
 
 import org.openapitools.client.models.User
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
index 7d40c8efbc2f..617982fdfe3b 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/ApiResponse.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,18 +26,23 @@ import java.io.Serializable
 
 /**
  * Describes the result of uploading an image resource
+ *
  * @param code 
  * @param type 
  * @param message 
  */
 
 data class ApiResponse (
+
     @Json(name = "code")
     val code: kotlin.Int? = null,
+
     @Json(name = "type")
     val type: kotlin.String? = null,
+
     @Json(name = "message")
     val message: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
index ceb0fbc8fe60..f458d178e337 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Category.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A category for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Category (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
index 941b2ec6d396..beaf9bbc2d3f 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Order.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * An order for a pets from the pet store
+ *
  * @param id 
  * @param petId 
  * @param quantity 
@@ -26,19 +36,26 @@ import java.io.Serializable
  */
 
 data class Order (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "petId")
     val petId: kotlin.Long? = null,
+
     @Json(name = "quantity")
     val quantity: kotlin.Int? = null,
+
     @Json(name = "shipDate")
     val shipDate: java.time.OffsetDateTime? = null,
+
     /* Order Status */
     @Json(name = "status")
     val status: Order.Status? = null,
+
     @Json(name = "complete")
     val complete: kotlin.Boolean? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -46,6 +63,7 @@ data class Order (
 
     /**
      * Order Status
+     *
      * Values: placed,approved,delivered
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
index 079c44f026a4..0ad65abf40e1 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Pet.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 import org.openapitools.client.models.Category
@@ -19,6 +28,7 @@ import java.io.Serializable
 
 /**
  * A pet for sale in the pet store
+ *
  * @param name 
  * @param photoUrls 
  * @param id 
@@ -28,19 +38,26 @@ import java.io.Serializable
  */
 
 data class Pet (
+
     @Json(name = "name")
     val name: kotlin.String,
+
     @Json(name = "photoUrls")
     val photoUrls: kotlin.collections.List<kotlin.String>,
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "category")
     val category: Category? = null,
+
     @Json(name = "tags")
     val tags: kotlin.collections.List<Tag>? = null,
+
     /* pet status in the store */
     @Json(name = "status")
     val status: Pet.Status? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
@@ -48,6 +65,7 @@ data class Pet (
 
     /**
      * pet status in the store
+     *
      * Values: available,pending,sold
      */
     enum class Status(val value: kotlin.String) {
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
index 944b1cd0a141..ded73dc723db 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/Tag.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,15 +26,19 @@ import java.io.Serializable
 
 /**
  * A tag for a pet
+ *
  * @param id 
  * @param name 
  */
 
 data class Tag (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "name")
     val name: kotlin.String? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123
diff --git a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
index 9697f07d5bf8..03d55050eb8d 100644
--- a/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
+++ b/samples/client/petstore/kotlin/src/main/kotlin/org/openapitools/client/models/User.kt
@@ -1,14 +1,23 @@
 /**
-* OpenAPI Petstore
-* This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
-*
-* The version of the OpenAPI document: 1.0.0
-* 
-*
-* NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
-* https://openapi-generator.tech
-* Do not edit the class manually.
-*/
+ * OpenAPI Petstore
+ *
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * Please note:
+ * This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * Do not edit this file manually.
+ */
+
+@file:Suppress(
+    "ArrayInDataClass",
+    "EnumEntryName",
+    "RemoveRedundantQualifierName",
+    "UnusedImport"
+)
+
 package org.openapitools.client.models
 
 
@@ -17,6 +26,7 @@ import java.io.Serializable
 
 /**
  * A User who is purchasing from the pet store
+ *
  * @param id 
  * @param username 
  * @param firstName 
@@ -28,23 +38,32 @@ import java.io.Serializable
  */
 
 data class User (
+
     @Json(name = "id")
     val id: kotlin.Long? = null,
+
     @Json(name = "username")
     val username: kotlin.String? = null,
+
     @Json(name = "firstName")
     val firstName: kotlin.String? = null,
+
     @Json(name = "lastName")
     val lastName: kotlin.String? = null,
+
     @Json(name = "email")
     val email: kotlin.String? = null,
+
     @Json(name = "password")
     val password: kotlin.String? = null,
+
     @Json(name = "phone")
     val phone: kotlin.String? = null,
+
     /* User Status */
     @Json(name = "userStatus")
     val userStatus: kotlin.Int? = null
+
 ) : Serializable {
     companion object {
         private const val serialVersionUID: Long = 123